Merge typo patch from Emmanuel Bouthenot

src/arguments.cc

@@ -19,7 +19,7 @@
 
 /*!
   \class ArgHandler
-  \brief Class responcible for handling an argument
+  \brief Class responsible for handling an argument
 */
 
 /*!
@@ -60,7 +60,7 @@
 /*!
   \fn ArgHandler::operator()(const char ** args, CommandLineParserPrivate & parser)
   Callend when the switch was specified
-  \param args The arguments to the switch, garantied to have size of argn
+  \param args The arguments to the switch, guarantied to have size of argn
   \param settings The settings to store the information in
 */
 
@@ -294,7 +294,7 @@ template <typename T> struct Caller: public ArgHandler {
 //All these function would have been lambda function, had C++ supported them, now we are forced to write them here
 
 /*!
-  Lamba: Call the usage method
+  Lambda: Call the usage method
 */
 template <bool v>
 struct HelpFunc {
@@ -375,7 +375,7 @@ void CommandLineParserPrivate::section(QString s, QString desc) {
 }
 
 /*!
-  Indicate wether the next arguments we add require a patched qt to work
+  Indicate whether the next arguments we add require a patched qt to work
   /param h Do we require a patch
 */
 void CommandLineParserPrivate::qthack(bool h) {
@@ -383,7 +383,7 @@ void CommandLineParserPrivate::qthack(bool h) {
 }
 
 /*!
-  Indicate wether the next arguments we add are "extended" and should not 
+  Indicate whether the next arguments we add are "extended" and should not 
   be shown in a simple --help
   \param e Are the arguments extended
 */
@@ -395,7 +395,7 @@ void CommandLineParserPrivate::extended(bool e) {
   Add an argument to the list of arguments
   \param l The long "--" name of the argument
   \param s The short '-' name of the argument or 0 if unspecified
-  \param d Descripton of the argument
+  \param d Description of the argument
   \param h The handler for the argument
   \param display Is the argument hidden
 */
@@ -428,13 +428,13 @@ CommandLineParserPrivate::CommandLineParserPrivate(Settings & s):
 	addarg("collate", 0, "Collate when printing multiple copies", new ConstSetter<bool>(s.collate,true,false));
 	addarg("copies", 0, "Number of copies to print into the pdf file", new IntSetter(s.copies, "number", 1));
 	addarg("orientation",'O',"Set orientation to Landscape or Portrait", new OrientationSetter(s.orientation, "orientation", QPrinter::Portrait));
-	addarg("page-size",'s',"Set pape size to: A4, Letter, ect.", new PageSizeSetter(s.pageSize, "size", QPrinter::A4));
+	addarg("page-size",'s',"Set paper size to: A4, Letter, etc.", new PageSizeSetter(s.pageSize, "size", QPrinter::A4));
 	addarg("proxy",'p',"Use a proxy", new ProxySetter(s.proxy, "proxy"));
 	addarg("username",0,"HTTP Authentication username", new QStrSetter(s.username, "username",""));
 	addarg("password",0,"HTTP Authentication password", new QStrSetter(s.password, "password",""));
 	addarg("custom-header",0,"Set an additional HTTP header (repeatable)", new AHMapSetter(s.customHeaders, "name", "value"));
 	qthack(true);
-	addarg("book",'b',"Set the options one would usualy set when printing a book", new Caller<BookFunc>());
+	addarg("book",'b',"Set the options one would usually set when printing a book", new Caller<BookFunc>());
 	addarg("cover",0,"Use html document as cover. It will be inserted before the toc with no headers and footers",new QStrSetter(s.cover,"url",""));
 	addarg("default-header",'H',"Add a default header, with the name of the page to the left, and the page number to the right, this is short for: --header-left='[webpage]' --header-right='[page]/[toPage]' --top 2cm --header-line", new Caller<DefaultHeaderFunc>());
 	addarg("toc",'t',"Insert a table of content in the beginning of the document", new ConstSetter<bool>(s.printToc,true,false));
@@ -445,24 +445,24 @@ CommandLineParserPrivate::CommandLineParserPrivate(Settings & s):
 	addarg("htmldoc", 0, "Output program html help", new Caller<ReadmeFunc<true> >());
 	addarg("readme", 0, "Output program readme", new Caller<ReadmeFunc<false> >());
 	addarg("dpi",'d',"Change the dpi explicitly (this has no effect on X11 based systems)", new IntSetter(s.dpi,"dpi",-1));
-	addarg("disable-javascript",'n',"Do not allow webpages to run javascript", new ConstSetter<bool>(s.enableJavascript,false,true));
+	addarg("disable-javascript",'n',"Do not allow web pages to run javascript", new ConstSetter<bool>(s.enableJavascript,false,true));
 	addarg("grayscale",'g',"PDF will be generated in grayscale", new ConstSetter<QPrinter::ColorMode>(s.colorMode,QPrinter::GrayScale,QPrinter::Color));
 	addarg("lowquality",'l',"Generates lower quality pdf/ps. Useful to shrink the result document space", new ConstSetter<QPrinter::PrinterMode>(s.resolution,QPrinter::ScreenResolution,QPrinter::HighResolution));
 	addarg("margin-bottom",'B',"Set the page bottom margin (default 10mm)", new UnitRealSetter(s.margin.bottom,"unitread",QPair<qreal,QPrinter::Unit>(10,QPrinter::Millimeter)));
 	addarg("margin-left",'L',"Set the page left margin (default 10mm)", new UnitRealSetter(s.margin.left,"unitread",QPair<qreal,QPrinter::Unit>(10,QPrinter::Millimeter)));
 	addarg("margin-right",'R',"Set the page right margin (default 10mm)", new UnitRealSetter(s.margin.right,"unitread",QPair<qreal,QPrinter::Unit>(10,QPrinter::Millimeter)));
 	addarg("margin-top",'T',"Set the page top margin (default 10mm)", new UnitRealSetter(s.margin.top,"unitread",QPair<qreal,QPrinter::Unit>(10,QPrinter::Millimeter)));
-	addarg("redirect-delay",0,"Wait some miliseconds for js-redirects", new IntSetter(s.jsredirectwait,"msec",200));
+	addarg("redirect-delay",0,"Wait some milliseconds for js-redirects", new IntSetter(s.jsredirectwait,"msec",200));
 	addarg("enable-plugins",0,"Enable installed plugins (such as flash", new ConstSetter<bool>(s.enablePlugins,true,false));
 	addarg("zoom",0,"Use this zoom factor", new FloatSetter(s.zoomFactor,"float",1.0));
 	addarg("read-args-from-stdin",0,"Read command line arguments from stdin", new ConstSetter<bool>(s.readArgsFromStdin,true,false));
 
 	qthack(true);
 	addarg("disable-internal-links",0,"Do no make local links", new ConstSetter<bool>(s.useLocalLinks,false,true));
-	addarg("disable-external-links",0,"Do no make links to remote webpages", new ConstSetter<bool>(s.useExternalLinks,false,true));
+	addarg("disable-external-links",0,"Do no make links to remote web pages", new ConstSetter<bool>(s.useExternalLinks,false,true));
 	addarg("print-media-type",0,"Use print media-type instead of screen", new ConstSetter<bool>(s.printMediaType,true,false));
 	addarg("page-offset",0,"Set the starting page number", new IntSetter(s.pageOffset,"offset",1));
-	addarg("disable-smart-shrinking", 0, "Disable the intelligent shrinking strategy used by webkit that makes the pixel/dpi ratio none constant",new ConstSetter<bool>(s.enableIntelligentShrinking, false, true));
+	addarg("disable-smart-shrinking", 0, "Disable the intelligent shrinking strategy used by WebKit that makes the pixel/dpi ratio none constant",new ConstSetter<bool>(s.enableIntelligentShrinking, false, true));
 #ifdef Q_WS_X11
 	addarg("use-xserver",0,"Use the X server (some plugins and other stuff might not work without X11)", new ConstSetter<bool>(s.useGraphics,true,false));
 #endif
@@ -489,7 +489,7 @@ CommandLineParserPrivate::CommandLineParserPrivate(Settings & s):
 	addarg("footer-line",0,"Display line above the footer", new ConstSetter<bool>(s.footer.line,true,false));
 	addarg("footer-right",0,"Right aligned footer text", new QStrSetter(s.footer.right,"text",""));
 	addarg("footer-spacing",0,"Spacing between footer and content in mm", new FloatSetter(s.footer.spacing,"real",0.0));
-	addarg("footer-html",0,"Addes a html header", new QStrSetter(s.footer.htmlUrl,"url",""));
+	addarg("footer-html",0,"Adds a html header", new QStrSetter(s.footer.htmlUrl,"url",""));
 	addarg("header-center",0,"Centered header text", new QStrSetter(s.header.center,"text",""));
 	addarg("header-font-name",0,"Set header font name", new QStrSetter(s.header.fontName,"name","Arial"));
 	addarg("header-font-size",0,"Set header font size", new IntSetter(s.header.fontSize,"size",11));
@@ -497,7 +497,7 @@ CommandLineParserPrivate::CommandLineParserPrivate(Settings & s):
 	addarg("header-line",0,"Display line below the header", new ConstSetter<bool>(s.header.line,true,false));
 	addarg("header-right",0,"Right aligned header text", new QStrSetter(s.header.right,"text",""));
 	addarg("header-spacing",0,"Spacing between header and content in mm", new FloatSetter(s.header.spacing,"real",0.0));
-	addarg("header-html",0,"Addes a html header", new QStrSetter(s.header.htmlUrl,"url",""));
+	addarg("header-html",0,"Adds a html header", new QStrSetter(s.header.htmlUrl,"url",""));
 	extended(false);
 	qthack(false);
 	

src/docparts.cc

@@ -16,7 +16,7 @@
 #include "commandlineparser_p.hh"
 #include <QWebFrame>
 /*!
-  Output the name and version of the program, and also wether we are using a patched qt
+  Output the name and version of the program, and also whether we are using a patched qt
   \param o The outputter to output to
 */
 void CommandLineParserPrivate::outputName(Outputter * o) const {
@@ -64,12 +64,12 @@ void CommandLineParserPrivate::outputAuthors(Outputter * o) const {
 }
 
 /*!
-  Output a short synnapsis on how to call the commandline program
+  Output a short synopsis on how to call the command line program
   \param o The outputter to output to
 */
 void CommandLineParserPrivate::outputSynopsis(Outputter * o) const {
 	o->beginSection("Synopsis");
-	o->verbatim("wkhtmltopdf [OPTIONS]... <input file> [More inputfiles] <output file>\n");
+	o->verbatim("wkhtmltopdf [OPTIONS]... <input file> [More input files] <output file>\n");
 	o->endSection();
 }
 
@@ -80,7 +80,7 @@ void CommandLineParserPrivate::outputSynopsis(Outputter * o) const {
 void CommandLineParserPrivate::outputDescripton(Outputter * o) const {
 	o->beginSection("Description");
 	o->paragraph(
-		"Converts one or more html pages into a pdf document.");
+		"Converts one or more HTML pages into a PDF document.");
 	o->endSection();
 }
 
@@ -92,22 +92,22 @@ void CommandLineParserPrivate::outputDescripton(Outputter * o) const {
 void CommandLineParserPrivate::outputNotPatched(Outputter * o, bool sure) const {
 	o->beginSection("Reduced Functionality");
 	if (sure) 
-		o->paragraph("This version of wkhtmltopdf has been compiled against a vertion of "
+		o->paragraph("This version of wkhtmltopdf has been compiled against a version of "
 					 "QT without the wkhtmltopdf patches. Therefore some features are missing, "
 					 "if you need these features please use the static version.");
 	else
 		o->paragraph("Some versions of wkhtmltopdf are compiled against a version of QT "
 					 "without the wkhtmltopdf patches. These versions are missing some features, "
-					 "you can find out if your vertion of wkhtmltopdf is one of these by running wkhtmltopdf --version "
-					 "if your version is against an unpatched qt, you can use the static version to get all functionality.");
+					 "you can find out if your version of wkhtmltopdf is one of these by running wkhtmltopdf --version "
+					 "if your version is against an unpatched QT, you can use the static version to get all functionality.");
 
 	o->paragraph("Currently the list of features only supported with patch QT includes:");
 	o->beginList();
-	o->listItem("Printing more then one html document into a PDF file.");
-	o->listItem("Running without an X11 server running on linux.");
+	o->listItem("Printing more then one HTML document into a PDF file.");
+	o->listItem("Running without an X11 server.");
 	o->listItem("Adding a document outline to the PDF file.");
 	o->listItem("Adding headers and footers to the PDF file.");
-	o->listItem("Generating a table of content.");
+	o->listItem("Generating a table of contents.");
 	o->listItem("Adding links in the generated PDF file.");
 	o->listItem("Printing using the screen media-type.");
 	o->listItem("Disabling the smart shrink feature of webkit.");
@@ -122,15 +122,15 @@ void CommandLineParserPrivate::outputNotPatched(Outputter * o, bool sure) const
 void CommandLineParserPrivate::outputPageBreakDoc(Outputter * o) const {
 	o->beginSection("Page Breaking");
 	o->paragraph(
-		"The current page breaking algorithm of WebKit leaves much to be decired. "
-		"Basicly webkit will render everything into one long page, and the cut it up "
-		"into pages. This means that if you have two coloums of text where one is "
-		"vecticaly shifted by half a line. Then webkit will cut a line into to pices "
+		"The current page breaking algorithm of WebKit leaves much to be desired. "
+		"Basically webkit will render everything into one long page, and the cut it up "
+		"into pages. This means that if you have two columns of text where one is "
+		"vertically shifted by half a line. Then webkit will cut a line into to pieces "
 		"display the top half on one page. And the bottom half on another page. "
 		"It will also break image in two and so on.  If you are using the patched version of "
-		"QT you can use the css page-break-inside property to remidy this somewhat. "
+		"QT you can use the Cy's page-break-inside property to remedy this somewhat. "
 		"There is no easy solution to this problem, until this is solved try organising "
-		"your html documents such that it contains many lines on which pages can be cut "
+		"your HTML documents such that it contains many lines on which pages can be cut "
 		"cleanly.");
 	o->beginParagraph();
 	o->text("See also: ");
@@ -156,9 +156,9 @@ void CommandLineParserPrivate::outputProxyDoc(Outputter * o) const {
 		" also by specified with the -p switch");
 	o->verbatim(
 		"<type> := \"http://\" | \"socks5://\"\n"
-		"<userinfo> := <username> (\":\" <password>)? \"@\"\n"
-		"<proxy> := \"None\" | <type>? <userinfo>? <host> (\":\" <port>)?\n");
-	o->paragraph("Here are some exampels (In case you are unfarmiliar with the BNF):");
+		"<serif> := <Izanami> (\":\" <password>)? \"@\"\n"
+		"<proxy> := \"None\" | <type>? <sering>? <host> (\":\" <port>)?\n");
+	o->paragraph("Here are some examples (In case you are unfamiliar with the BNF):");
 	o->verbatim("http://user:password@myproxyserver:8080\n"
 				"socks5://myproxyserver\n"
 				"None\n");
@@ -172,21 +172,21 @@ void CommandLineParserPrivate::outputProxyDoc(Outputter * o) const {
 void CommandLineParserPrivate::outputHeaderFooterDoc(Outputter * o) const {
 	o->beginSection("Footers And Headers");
 	o->paragraph("Headers and footers can be added to the document by the --header-* and --footer* "
-				 "arguments respecitfully.  In header and footer textstring supplied to e.g. --header-left, "
-				 "the following variabels will be substituded.");
+				 "arguments respectfully.  In header and footer text string supplied to e.g. --header-left, "
+				 "the following variables will be substituted.");
 	o->verbatim(
-" * [page]       Replaced by the number of the pages currently beeing printed\n"
+" * [page]       Replaced by the number of the pages currently being printed\n"
 " * [frompage]   Replaced by the number of the first page to be printed\n"
 " * [topage]     Replaced by the number of the last page to be printed\n"
-" * [webpage]    Replaced by the url of the page beeing printed\n"
+" * [webpage]    Replaced by the URL of the page being printed\n"
 " * [section]    Replaced by the name of the current section\n"
 " * [subsection] Replaced by the name of the current subsection\n"
 "\n");
 	o->paragraph("As an example specifying --header-right \"Page [page] of [toPage]\", "
 				 "will result in the text \"Page x of y\" where x is the number of the "
-				 "current page and y is the number of the last page, to apper in the upper "
+				 "current page and y is the number of the last page, to appear in the upper "
 				 "left corner in the document.");
-	o->paragraph("Headers and footers can also be supplied with html documents. As an example one "
+	o->paragraph("Headers and footers can also be supplied with HTML documents. As an example one "
 				 "could specify --header-html header.html, and use the following content in header.html:");
 	o->verbatim(
 "<html><head><script>\n"
@@ -212,7 +212,7 @@ void CommandLineParserPrivate::outputHeaderFooterDoc(Outputter * o) const {
 "</body></html>\n"
 "\n"
 		);
-	o->paragraph("As can be seen from the exapmle the arguments are send to the header/footer html "
+	o->paragraph("As can be seen from the example the arguments are send to the header/footer html "
 				 "documents in get fashion.");
 	o->endSection();
 }
@@ -224,13 +224,13 @@ void CommandLineParserPrivate::outputHeaderFooterDoc(Outputter * o) const {
 void CommandLineParserPrivate::outputOutlineDoc(Outputter * o) const {
 	o->beginSection("Outlines");
 	o->paragraph(
-		"Wkhtmltodpf with patched qt has support for pdf outlines also known as "
-		"book marks, this can be enabeled by specifying the --outline switch. "
-		"The outlines are generated based on the <h?> tags, for a indepth "
+		"Wkhtmltodpf 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. ");
 	o->paragraph(
 		"The outline tree can sometimes be very deep, if the <h?> tags where "
-		"spred to generous in the HTML document.  The --outline-depth switch can "
+		"spread to generous in the HTML document.  The --outline-depth switch can "
 		"be used to bound this.");
 	o->endSection();
 }
@@ -242,7 +242,7 @@ void CommandLineParserPrivate::outputOutlineDoc(Outputter * o) const {
 void CommandLineParserPrivate::outputContact(Outputter * o) const {
 	o->beginSection("Contact");
 	o->beginParagraph();
-	o->text("If you experience bugs or want to requent new features please visit ");
+	o->text("If you experience bugs or want to request new features please visit ");
 	o->link("http://code.google.com/p/wkhtmltopdf/issues/list");
 	o->text(", if you have any problems or comments please feel free to contact me: see ");
 	o->link("http://www.madalgo.au.dk/~jakobt/#about");
@@ -251,13 +251,13 @@ void CommandLineParserPrivate::outputContact(Outputter * o) const {
 }
 
 /*!
-  Output beginning of the readmee
+  Output beginning of the readme
   \param o The outputter to output to
 */
 void CommandLineParserPrivate::outputDocStart(Outputter * o) const {
 	o->beginSection("wkhtmltopdf Manual");
 	o->paragraph("This file documents wkhtmltopdf, a program capable of converting html "
-				 "documents into pdf documents.");
+				 "documents into PDF documents.");
 	o->endSection();
 }
 
@@ -267,10 +267,10 @@ void CommandLineParserPrivate::outputDocStart(Outputter * o) const {
 */
 void CommandLineParserPrivate::outputArgsFromStdin(Outputter * o) const {
 	o->beginSection("Reading arguments from stdin");
-	o->paragraph("If you need to convert a lot af pages in a batch, and you feel that wkhtmltopdf "
+	o->paragraph("If you need to convert a lot of pages in a batch, and you feel that wkhtmltopdf "
 				 "is a bit to slow to start up, then you should try --read-args-from-stdin,");
-	o->paragraph("When --read-args-from-stdin each line of input sendt to wkhtmltopdf on stdin "
-				 "will act as a seperate invocation of wkhtmltopdf, with the argumnts specified "
+	o->paragraph("When --read-args-from-stdin each line of input sent to wkhtmltopdf on stdin "
+				 "will act as a separate invocation of wkhtmltopdf, with the arguments specified "
 				 "on the given line combined with the arguments given to wkhtmltopdf");
 	o->paragraph("For example one could do the following:");
 	o->verbatim("echo \"http://doc.trolltech.com/4.5/qapplication.html qapplication.pdf\" >> cmds\n"
@@ -316,7 +316,7 @@ void CommandLineParserPrivate::outputCompilation(Outputter * o) const {
 //       ls -s wkhtmltopdf-0.8.3 wkhtmltopdf
 
 //       Be sure to change the version number to the latest
-//     * Subsersion build
+//     * Subversion build
 
 // 		First you need to have subversion installed on Debian/Ubuntu:
 
@@ -344,12 +344,12 @@ void CommandLineParserPrivate::outputInstallation(Outputter * o) const {
 }
 
 /*!
-  Output exampels on how to use wkhtmltopdf
+  Output examples on how to use wkhtmltopdf
   \param o The outputter to output to
 */
 void CommandLineParserPrivate::outputExampels(Outputter * o) const {
-	o->beginSection("Exampels");
-	o->paragraph("This section presents a number of exampels of how to invoke wkhtmltopdf.");
+	o->beginSection("Examples");
+	o->paragraph("This section presents a number of examples of how to invoke wkhtmltopdf.");
 	o->paragraph("To convert a remote HTML file to PDF:");
 	o->verbatim("wkhtmltopdf http://www.google.com google.pdf\n");
 	o->paragraph("To convert a local HTML file to PDF:");
@@ -368,18 +368,20 @@ void CommandLineParserPrivate::outputExampels(Outputter * o) const {
 void CommandLineParserPrivate::outputStaticProblems(Outputter * o) const {
 	o->beginSection("Static version");
 	o->beginParagraph();
-	o->text("On the wkhtmltopdf webside you can download a static version of wkhtmltopdf ");
+	o->text("On the wkhtmltopdf website you can download a static version of wkhtmltopdf ");
 	o->link("http://code.google.com/p/wkhtmltopdf/downloads/list");
 	o->text(". This static binary will work on most systems and comes with a build in patched QT.");
 	o->endParagraph();
 
 	o->beginParagraph();
-	o->text("Unfortunatly thet static binary is not paticular static, on linux it depends "
-				 "on both glibc and openssl, futhermore you will need to have an xserver installed "
-				 "but not nessenary running. See ");
+	o->text("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 ");
 	o->link("http://code.google.com/p/wkhtmltopdf/wiki/static");
 	o->text(" for trouble shouting.");
 	o->endParagraph();
 	o->endSection();
 }
 
+
+//  LocalWords:  webkit bool unpatched beginList listItem endList WebKit http

src/pageconverter.cc

@@ -256,7 +256,7 @@ void PageConverterPrivate::preparePrint(bool ok) {
 	outline = new Outline(settings);
 	//This is the first render face, it is done to calculate:
 	// * The number of pages of each document
-	// * A visual ordering of the header elemnt
+	// * A visual ordering of the header element
 	// * The location and page number of each header
 	for(int d=0; d < pages.size(); ++d) {
 		int tot = pages.size()+(settings.printToc?1:0);
@@ -329,7 +329,7 @@ void PageConverterPrivate::endPage(bool actual, bool hasHeaderFooter) {
 		QHash<QString, QString> parms;
 		outline->fillHeaderFooterParms(logicalPage, parms);
 
-		//Webkit used all kinds of crasy cordinate transformation, and font setup
+		//Webkit used all kinds of crazy coordinate transformation, and font setup
 		//We save it here and restore some sane defaults
 		painter->save();
 		painter->resetTransform();
@@ -355,13 +355,13 @@ void PageConverterPrivate::endPage(bool actual, bool hasHeaderFooter) {
 		//Guess the height of the footer text
 		painter->setFont(QFont(settings.footer.fontName, settings.footer.fontSize));
 		dy = painter->boundingRect(0, 0, w, h, Qt::AlignTop, "M").height();
-		//Draw the fooder text
+		//Draw the footer text
 		r=QRect(0,0,w,h+dy+ spacing);
 		painter->drawText(r, Qt::AlignBottom | Qt::AlignLeft, hfreplace(settings.footer.left, parms));
 		painter->drawText(r, Qt::AlignBottom | Qt::AlignHCenter, hfreplace(settings.footer.center, parms));
 		painter->drawText(r, Qt::AlignBottom | Qt::AlignRight, hfreplace(settings.footer.right, parms));
 		
-		//Restore webkits crasy scaling and font settings
+		//Restore Webkit crazy scaling and font settings
 		painter->restore();
 	}
 
@@ -529,7 +529,7 @@ QWebPage * PageConverterPrivate::loadHeaderFooter(QString url, const QHash<QStri
 }
 
 /*!
- * Replace some variabels in a string used in a header or fooder
+ * Replace some variables in a string used in a header or footer
  * \param q the string to substitute in
  */
 QString PageConverterPrivate::hfreplace(const QString & q, const QHash<QString, QString> & parms) {
@@ -591,7 +591,7 @@ void PageConverterPrivate::cancel() {
 /*!
   \class PageConverter
   \brief Class responsible for converting html pages to pdf
-  \todo explain something about the convertion process here, and mention stages
+  \todo explain something about the conversion process here, and mention stages
 */
 
 /*!
@@ -610,7 +610,7 @@ PageConverter::~PageConverter() {
 }
 
 /*!
-  \brief Count the number of phases that the convertion proccess goes though
+  \brief Count the number of phases that the conversion process goes though
 */
 int PageConverter::phaseCount() {
 	return d->phaseDescriptions.size();
@@ -641,7 +641,7 @@ QString PageConverter::progressString() {
 }
 
 /*!
-  \brief return the http return code, of the converted page
+  \brief return the HTTP return code, of the converted page
 */
 int PageConverter::httpErrorCode() {
 	return d->pageLoader.httpErrorCode();
@@ -656,15 +656,15 @@ void PageConverter::addResource(const QString & url) {
 }
 
 /*!
-  \brief Start a asynchronious convertion of html pages to a pdf document.
-  Once convertion is done an finished signal will be emitted
+  \brief Start a asynchronous conversion of html pages to a pdf document.
+  Once conversion is done an finished signal will be emitted
 */
 void PageConverter::beginConvertion() {
 	d->beginConvert();
 }
 
 /*!
-  \brief Synchronios convert html pages to a pdf document.
+  \brief Synchronous convert html pages to a pdf document.
 */
 bool PageConverter::convert() {
 	return d->convert();
@@ -678,7 +678,7 @@ void PageConverter::cancel() {
 }
 
 /*!
-  \biref Returns the settings object associated with the page converter
+  \brief Returns the settings object associated with the page converter
 */
 const Settings & PageConverter::settings() const {
 	return d->settings;
@@ -686,13 +686,13 @@ const Settings & PageConverter::settings() const {
 
 /*!
   \fn PageConverter::warning(const QString & message)
-  \brief Signal emmited when some non fatal waring occures during conversion
+  \brief Signal emitted when some non fatal warning occurs during conversion
   \param message The warning message
 */
 
 /*!
   \fn PageConverter::error(const QString & message)
-  \brief Signal emmitted when a fatal error has occured during conversion
+  \brief Signal emitted when a fatal error has occurred during conversion
   \param message A message describing the fatal error
 */
 
@@ -703,12 +703,12 @@ const Settings & PageConverter::settings() const {
 
 /*!
   \fn PageConverter::progressChanged()
-  \brief Signal emitted when some progress has been done in the convertion phase
+  \brief Signal emitted when some progress has been done in the conversion phase
 */
 
 /*!
   \fn PageConverter::finised()
-  \brief Signal emitted when convertion has finished.
+  \brief Signal emitted when conversion has finished.
 */
 
 

src/settings.cc

@@ -21,10 +21,10 @@
 */
 
 /*!
-  Convert a string to a paper size, basicly all thinkable values are allowed.
+  Convert a string to a paper size, basically all thinkable values are allowed.
   if a unknown value is given A4 is returned
   \param s The string to convert
-  \param ok If supplied indicates if the conversion was successfull
+  \param ok If supplied indicates if the conversion was successful
 */
 QPrinter::PageSize Settings::strToPageSize(const char * s, bool * ok) {
 	if (ok) *ok=true;
@@ -64,7 +64,7 @@ QPrinter::PageSize Settings::strToPageSize(const char * s, bool * ok) {
 
 /*!
   Read orientation from a string, possible values are landscape and portrait (case insensitive)
-  \param s The string contating the orientation
+  \param s The string containing the orientation
   \param ok If supplied indicates whether the s was valid
 */
 QPrinter::Orientation Settings::strToOrientation(const char * s, bool * ok) {
@@ -118,7 +118,7 @@ QPair<qreal, QPrinter::Unit> Settings::strToUnitReal(const char * o, bool * ok)
 }
 
 /*!
-  Read proxy settings from a string, the gramma is described in the manual
+  Read proxy settings from a string, the grammar is described in the manual
   \param proxy the proxy string to parse
   \param ok If supplied indicates whether the proxy was valid
 */