MErge conflict resolved.

sphinx/source/AppendicesIntro.clean.rst

@@ -44,7 +44,7 @@ and possibly disk access to the QL. The boards listed here actually
 replace parts of the original QL, increasing speed and adding a host of
 other features.
 
-**[6]** :ref:`a6-compatability`
+**[6]** :ref:`a6-compatibility`
 
 This section provides basic and some expert background information on
 software and hardware compatibility across the range of different QL
@@ -118,6 +118,6 @@ reliability over data sent.
 
 **[18]** :ref:`a18-configuring--programs`
 
-This section covers the use of the CONFIG utility to configure a 
+This section covers the use of the CONFIG utility to configure a
 program with suitable default settings.
 

sphinx/source/Appendix02.clean.rst

@@ -110,12 +110,12 @@ version of EOF has now been renamed EOFW.
 A2.3 Empty Brackets
 -------------------
 
-| An empty bracket is always regarded as a syntax error by original QL
-  ROMs whereas SMSQ/E (in common with Minerva) tolerates them, for
-  example to indicate that a function is called with a parameter, eg.
-  DATE(). If a program should be portable than you have to avoid this
-  style because all other implementations (other than Minerva) mark such
-  lines with a MISTake:
+An empty bracket is always regarded as a syntax error by original QL
+ROMs whereas SMSQ/E (in common with Minerva) tolerates them, for
+example to indicate that a function is called with a parameter, eg.
+DATE(). If a program should be portable than you have to avoid this
+style because all other implementations (other than Minerva) mark such
+lines with a MISTake:
 
 ::
 
@@ -218,7 +218,7 @@ A2.9.1 Extra Colours
 SMSQ/E v2.98 implements a different display driver for many systems,
 including 65536 colours on the QXL, QPC and Q40 - see Appendix 16.
 Because the format of the display is different to the original QL, this
-may cause incompatability problems with many of the drawing commands
+may cause incompatibility problems with many of the drawing commands
 covered in this book which assume the original QL screen format. This
 can however be overcome by only using these commands or programs which
 cause problems in the original display configuration of 512x256 pixels,
@@ -296,5 +296,3 @@ be resolved in later versions.
 
 See also FLP\_DENSITY.
 
-
-

sphinx/source/Appendix03.clean.rst

@@ -612,7 +612,7 @@ Qubbesoft P/D.
 
 Details about the emulator are on the Web at:
 
-http://www.emulnews.com/aer/articles/af (This link no lonegr works. NDunbar)
+http://www.emulnews.com/aer/articles/af (This link no longer works. NDunbar)
 
 The program loads the operating system from disk and basically simulates
 a JS ROM QL with a few additions in later versions. Although a public
@@ -762,5 +762,3 @@ If you use Minerva, you can use higher resolution display modes (up to
 The main incompatibility problem with this emulator is due to the case
 sensitive names used by Unix (ie. filenames).
 
-
-

sphinx/source/Appendix05.clean.rst

@@ -31,7 +31,7 @@ allow POKE 114796,0 to force the Gold Card to run at 24MHz (it normally
 runs at 16MHz compared to the QL's 12MHz). The circumstances where this
 works are undefined at the moment, but see below. Some users have
 however reported problems with some software running at this speed, and
-in particular the network and microdrives are unuseable. The Gold Card
+in particular the network and microdrives are unusable. The Gold Card
 can be returned to normal with POKE 114796,255.
 
 The so-called Gold Card Go-Faster POKE works on a certain series of Gold
@@ -119,7 +119,7 @@ A5.4 Q40
 Q40 is a replacement motherboard for the QL. It is supplied with 16Mb
 RAM (although it will support up to 32Mb) and an I/O card. You will need
 to add a tower case, a keyboard, floppy and hard disk drives, a standard
-PC monitor and mouse. The Q40 even has the ability to drive stero sound,
+PC monitor and mouse. The Q40 even has the ability to drive stereo sound,
 using an in-built digital to analogue converter which can be used with
 either speakers or headphones. All drivers and equipment to connect
 these items to the motherboard are built in.
@@ -201,5 +201,3 @@ to the Recycle Bin on Windows 95).
 Unfortunately, problems have been reported with the Trashcan facility
 which makes it unreliable.
 
-
-

sphinx/source/Appendix06.clean.rst

@@ -1,4 +1,4 @@
-..  _a6-compatability:
+..  _a6-compatibility:
 
 A6 Compatibility
 ================
@@ -47,13 +47,13 @@ machine. Parts of memory are moved around freely, making use of the
 calls incorporated into QDOS by the QL's designers and even the speed of
 the QL has altered. Despite the best attempts of the manufacturers of
 the Gold Card and emulators, this has resulted in one or two
-incompatabilities with older software.
+incontestabilities with older software.
 
 A6.2 Speed
 ----------
 
 Both QDOS emulators and the Gold Card have greatly increased the speed
-at which the QL works, making some programs unuseable. Luckily the
+at which the QL works, making some programs unusable. Luckily the
 effects of this are limited by various commands which slow the operating
 speed of emulators and the Gold Card down.
 
@@ -103,7 +103,7 @@ There are two types of SuperBASIC compiler which have been produced for
 the QL, namely true compilers (Turbo and Supercharge) which produce
 independent machine code, not relying in any way on SuperBASIC
 structures (and the code produced is therefore much more portable
-between different QDOS machines) and so-called psuedo compilers
+between different QDOS machines) and so-called pseudo compilers
 (Qliberator) which produce machine code which still uses SuperBASIC
 structures and calls.
 
@@ -121,7 +121,7 @@ currently compile a program which from within a multiple copy of BASIC.
 Patch programs have been released which enable Turbo compiled programs
 to be used on a system which has a large amount of memory (such as the
 Q40). Later versions of the Turbo Toolkit (v3d27 and later) are also
-required for better compatability.
+required for better compatibility.
 
 However, one of the remaining problems with SMSQ/E which is displayed by
 Turbo compiled programs is the failure of the in- built Integer to ASCII
@@ -192,6 +192,3 @@ are covered in the appendices dealing with each one.
 There are also various points explained in the main keywords section of
 this book.
 
-
-
-

sphinx/source/Appendix08.clean.rst

@@ -237,11 +237,11 @@ A8.2 Foreign Error Messages
 In the following tables, we have tried to list as many of the different
 language implementations as possible (thanks to QView for this
 information), although there are bound to be some languages which are
-not covered here (for example the Russian laguages supported on the THOR
+not covered here (for example the Russian languages supported on the THOR
 XVI).
 
 If you can supply any further error messages supported on the QL or its
-deriviatives, then please contact us with a full print-out of the error
+derivatives, then please contact us with a full print-out of the error
 messages (and preferably, a file on disk with containing the error
 messages supported).
 
@@ -442,7 +442,7 @@ follows:
 | -23     | Zugriff verweigert         | accès interdit             |
 +---------+----------------------------+----------------------------+
 
-SMS also incoporates an improved Interpreter, and as a result, has a
+SMS also incorporates an improved Interpreter, and as a result, has a
 long list of further errors which can appear either before a program is
 RUN or whilst a program is RUNning. These errors do not affect ERNUM and
 do not have an error code as such. Each error is given in English,
@@ -493,7 +493,7 @@ process.
 
 This is reported during PARSING - it normally occurs where you have made
 a typing error when entering a line and placed two operators together
-when this is not allowed (or meangingless). For example, the following
+when this is not allowed (or meaningless). For example, the following
 line will cause this error:
 
 	x = x ++ 1
@@ -532,7 +532,7 @@ However, the interpreter reports this error very infrequently - normally
 This message is generated during PARSING - it appears when a program
 line has more opening brackets than closing brackets.
 
-For example: 
+For example:
 
 	PRINT CHR$ ((HEX ('d2'))
 
@@ -570,7 +570,7 @@ This error is reported during PARSING whenever a program line is entered
 which contains a string within quote marks (either single or double) and
 one of those quote marks is missing.
 
-Example: 
+Example:
 
 	PRINT 'Hello "There"
 
@@ -580,7 +580,7 @@ Example:
 
 **falsche Definition einer Prozedur oder Funktion**
 
-(German) 
+(German)
 
 **mauvaise définition d'une procédure ou fonction**
 
@@ -960,7 +960,7 @@ This message is generated during PRE-COMPILING in one of two cases:
     20 PRINT 'Hello'
     30 END SELect
 
-- the comparison values appear in a program outside of a SELect ON 
+- the comparison values appear in a program outside of a SELect ON
   structure, for example:
 
 ::
@@ -1314,7 +1314,7 @@ array which has not yet been DIMensioned, for example:
 	CLEAR
 
 	x(100)=52
- 
+
 Compare the situation where you try to index a name which is in fact
 defined as a Procedure - the index is ignored and the Procedure executed
 as normal, for example
@@ -1395,7 +1395,7 @@ If an error is generated whilst the program is executing a DEFine
 PROCedure or DEFine FuNction structure, this error will be generated
 when you EDIT the program, or enter CONTINUE. Unlike earlier ROMs, this
 does not seem to prevent you from using CONTINUE to carry on with
-RUNning the program from the place the error occured.
+RUNning the program from the place the error occurred.
 
 **At line**
 
@@ -1410,7 +1410,7 @@ RUNning the program from the place the error occured.
 (French)
 
 This is merely the message used to generate part of all error messages,
-signifying the line number and statement number where the error occured.
+signifying the line number and statement number where the error occurred.
 
 **FATAL ERROR IN SBASIC INTERPRETER**
 
@@ -1432,5 +1432,3 @@ One instance where this error will occur is if you try to RUN a program
 which has been QLOADed and the original file was created using QSAVE on
 a Minerva ROM with integer tokenisation enabled.
 
-
-

sphinx/source/Appendix09.clean.rst

@@ -582,7 +582,7 @@ British QL
     F2     TAB    Q   W   E   R   T   Y   U   I   O   P   [   ]
     F3     CAPS    A   S   D   F   G   H   J   K   L   ;   '      ENTER
     F4     SHIFT     Z   X   C   V   B   N   M   ,   .   /     SHIFT
-    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT 
+    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT
 
 German QL
 ^^^^^^^^^
@@ -593,7 +593,7 @@ German QL
     F2     TAB    Q   W   E   R   T   Z   U   I   O   P   Ü   +
     F3     CAPS    A   S   D   F   G   H   J   K   L   Ö   Ä      ENTER
     F4     SHIFT     Y   X   C   V   B   N   M   ,   .   -     SHIFT
-    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT 
+    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT
 
 French QL
 ^^^^^^^^^
@@ -604,7 +604,7 @@ French QL
     F2     TAB    A   Z   E   R   T   Y   U   I   O   P   é   è
     F3     CAPS    Q   S   D   F   G   H   J   K   L   M   à      ENTER
     F4     SHIFT     W   X   C   V   B   N   ,   .   ;   ç     SHIFT
-    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT 
+    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT
 
 Swedish QL
 ^^^^^^^^^^
@@ -615,7 +615,7 @@ Swedish QL
     F2     TAB    Q   W   E   R   T   Y   U   I   O   P   Å   *
     F3     CAPS    A   S   D   F   G   H   J   K   L   Ö   Ä      ENTER
     F4     SHIFT     Z   X   C   V   B   N   M   ,   .   -     SHIFT
-    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT 
+    F5     CTRL  LEFT RIGHT          SPACE             UP  DOWN   ALT
 
 Finnish QL
 ^^^^^^^^^^
@@ -626,7 +626,7 @@ Finnish QL
     F2     TAB    Q   W   E   R   T   Y   U   I   O   P   Å   ^
     F3     LUKITUS A   S   D   F   G   H   J   K   L   Ö   Ä      ENTER
     F4     VAIHTO   Z   X   C   V   B   N   M   ,   .   -      VAIHTO
-    F5     OHJAUS LEFT RIGHT         SPACE            UP DOWN     SIIRTO 
+    F5     OHJAUS LEFT RIGHT         SPACE            UP DOWN     SIIRTO
 
 Danish QL
 ^^^^^^^^^