lots of minor spelling corrections

closes #2597 by Ben McGinnes  <ben@adversary.org>
closes #2665 by Taichi Sasaki <t.sasaki@ebisol.co.jp>
closes #2786 by Robin Tweedie <robin@songkick.com>

include/wkhtmltox/converter.hh

@@ -48,7 +48,7 @@ signals:
 	void radiobuttonSvgChanged(const QString & path);
 	void radiobuttonCheckedSvgChanged(const QString & path);
 public slots:
-    void beginConvertion();
+    void beginConversion();
 	bool convert();
 	void cancel();
 protected:

src/lib/converter.cc

@@ -60,7 +60,7 @@ void ConverterPrivate::updateWebSettings(QWebSettings * ws, const settings::Web
 
 void ConverterPrivate::fail() {
 	error = true;
-	convertionDone = true;
+	conversionDone = true;
 	clearResources();
 	emit outer().finished(false);
 	qApp->exit(0); // quit qt's event handling
@@ -88,9 +88,9 @@ void ConverterPrivate::cancel() {
 }
 
 bool ConverterPrivate::convert() {
-	convertionDone=false;
+	conversionDone=false;
 	beginConvert();
-	while (!convertionDone)
+	while (!conversionDone)
 		qApp->processEvents(QEventLoop::WaitForMoreEvents | QEventLoop::AllEvents);
 	return !error;
 }
@@ -138,7 +138,7 @@ int Converter::httpErrorCode() {
   \brief Start a asynchronous conversion of html pages to a pdf document.
   Once conversion is done an finished signal will be emitted
 */
-void Converter::beginConvertion() {
+void Converter::beginConversion() {
 	priv().beginConvert();
 }
 

src/lib/converter.hh

@@ -51,7 +51,7 @@ signals:
 	void radiobuttonSvgChanged(const QString & path);
 	void radiobuttonCheckedSvgChanged(const QString & path);
 public slots:
-    void beginConvertion();
+    void beginConversion();
 	bool convert();
 	void cancel();
 protected:

src/lib/converter_p.hh

@@ -45,7 +45,7 @@ protected:
 	virtual Converter & outer() = 0;
 	int errorCode;
 
-	bool convertionDone;
+	bool conversionDone;
 
 	void updateWebSettings(QWebSettings * ws, const settings::Web & s) const;
 public slots:

src/lib/imageconverter.cc

@@ -62,7 +62,7 @@ ImageConverterPrivate::ImageConverterPrivate(ImageConverter & o, wkhtmltopdf::se
 
 void ImageConverterPrivate::beginConvert() {
 	error = false;
-	convertionDone = false;
+	conversionDone = false;
 	errorCode = 0;
 	progressString = "0%";
 	loaderObject = loader.addResource(settings.in, settings.loadPage, &inputData);
@@ -226,7 +226,7 @@ void ImageConverterPrivate::pagesLoaded(bool ok) {
 
 	currentPhase = 2;
 	emit out.phaseChanged();
-	convertionDone = true;
+	conversionDone = true;
 	emit out.finished(true);
 
 	qApp->exit(0); // quit qt's event handling

src/lib/pdf_c_bindings.cc

@@ -530,7 +530,7 @@ CAPI(void) wkhtmltopdf_set_finished_callback(wkhtmltopdf_converter * converter,
 }
 
 //CAPI(void) wkhtmltopdf_begin_conversion(wkhtmltopdf_converter * converter) {
-//	reinterpret_cast<MyPdfConverter *>(converter)->converter.beginConvertion();
+//	reinterpret_cast<MyPdfConverter *>(converter)->converter.beginConversion();
 //}
 
 /**
@@ -684,5 +684,6 @@ CAPI(long) wkhtmltopdf_get_output(wkhtmltopdf_converter * converter, const unsig
 //  LocalWords:  includeInOutline pagesCount tocXsl xsl struct typedef str CAPI
 //  LocalWords:  param STRINGIZEE STRINGIZE deinit qApp strcpy wkhtmltox arg ug
 //  LocalWords:  WS MACX MyLooksStyle setStyle isNull qstrncpy MyPdfConverter
-//  LocalWords:  beginConvertion paragm addResource currentPhase phaseCount
-//  LocalWords:  urrent http httpErrorCode QByteArray constData
+//  LocalWords:  beginConversion beginConvertion paragm addResource
+//  LocalWords:  currentPhase phaseCount urrent http httpErrorCode QByteArray
+//  LocalWords:  constData

src/lib/pdfconverter.cc

@@ -1053,7 +1053,7 @@ void PdfConverterPrivate::printDocument() {
 	currentPhase = 2;
 #endif
 	emit out.phaseChanged();
-	convertionDone = true;
+	conversionDone = true;
 	emit out.finished(true);
 
 	qApp->exit(0); // quit qt's event handling

src/pdf/pdfdocparts.cc

@@ -54,7 +54,7 @@ void PdfCommandLineParser::outputSynopsis(Outputter * o) const {
 	o->text(" section can only be placed in the global options area");
 	o->endParagraph();
 
-	o->paragraph("A page objects puts the content of a singe webpage into the output document.");
+	o->paragraph("A page objects puts the content of a single webpage into the output document.");
 	o->verbatim("(page)? <input url/file name> [PAGE OPTION]...");
 	o->beginParagraph();
 	o->text("Options for the page object can be placed in the global options and the page "
@@ -65,7 +65,7 @@ void PdfCommandLineParser::outputSynopsis(Outputter * o) const {
 	o->text(" sections.");
 	o->endParagraph();
 
-	o->paragraph("A cover objects puts the content of a singe webpage into the output document, "
+	o->paragraph("A cover objects puts the content of a single webpage into the output document, "
 				 "the page does not appear in the table of content, and does not have headers and footers.");
 	o->verbatim("cover <input url/file name> [PAGE OPTION]...");
 	o->paragraph("All options that can be specified for a page object can also be specified for a cover.");
@@ -131,7 +131,7 @@ void PdfCommandLineParser::outputNotPatched(Outputter * o, bool sure) const {
 	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.");
+	o->listItem("Disabling the smart shrink feature of WebKit.");
 	o->endList();
 	o->endSection();
 }
@@ -144,9 +144,9 @@ void PdfCommandLineParser::outputPageBreakDoc(Outputter * o) const {
 	o->beginSection("Page Breaking");
 	o->paragraph(
 		"The current page breaking algorithm of WebKit leaves much to be desired. "
-		"Basically Webkit will render everything into one long page, and then cut it up "
+		"Basically WebKit will render everything into one long page, and then 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 "
+		"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 remedy this somewhat. "
@@ -252,7 +252,7 @@ void PdfCommandLineParser::outputTableOfContentDoc(Outputter * o) const {
 	o->listItem("\"title\" the name of the section.");
 	o->listItem("\"page\" the page number the section occurs on.");
 	o->listItem("\"link\" a URL that links to the section.");
-	o->listItem("\"backLink\" the name of the anchor the the section will link back to.");
+	o->listItem("\"backLink\" the name of the anchor the section will link back to.");
 	o->endList();
 
 	o->paragraph("The remaining TOC options only affect the default style sheet "