merge patched into master

4 files changed, 846 insertions, 2 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 207464d..375fb90 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-b02bf149c06972e652b737aa03ce155b579b7bf5
-b02bf149c06972e652b737aa03ce155b579b7bf5
+5a650249f7bca68f336d7414b3967672ee7d43ec
+5a650249f7bca68f336d7414b3967672ee7d43ec
 b02bf149c06972e652b737aa03ce155b579b7bf5
 b02bf149c06972e652b737aa03ce155b579b7bf5
 mdk-doc_1.2.9.orig.tar.gz
diff --git a/debian/patches/img-path.patch b/debian/patches/img-path.patch
new file mode 100644
index 0000000..527a1fa
--- /dev/null
+++ b/debian/patches/img-path.patch
@@ -0,0 +1,103 @@
+From d2af3ba849ec8178ece0c025c6e38c5f20a84884 Mon Sep 17 00:00:00 2001
+From: Peter Pentchev <roam@ringlet.net>
+Date: Wed, 10 Jan 2018 17:08:43 +0200
+Subject: Fix the paths to the images.
+
+Forwarded: not-needed
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2016-01-17
+Patch-Name: img-path.patch
+---
+ doc/mdk_gmixvm.texi | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
+index 2c29553..d866cc7 100644
+--- a/doc/mdk_gmixvm.texi
++++ b/doc/mdk_gmixvm.texi
+@@ -66,11 +66,11 @@ main window will appear, offering you a graphical interface to run and
+ debug your MIX programs.
+ 
+ @ifinfo
+-@image{img/ss_mix, 400pt}
++@image{/usr/share/doc/mdk-doc/html/img/ss_mix, 400pt}
+ @end ifinfo
+ 
+ @ifhtml
+-@image{../img/ss_mix, 400pt}
++@image{img/ss_mix, 400pt}
+ @end ifhtml
+ 
+ Apart from the menu and status bars, we can distinguish two zones (or
+@@ -98,7 +98,7 @@ notebook page) or the menu entries under @code{@w{View->Detached windows}}.
+ Here is an screenshot showing how @code{gmixvm} looks like when running
+ with a couple of detached windows:
+ 
+-@image{../img/ss_split, 420pt}
++@image{img/ss_split, 420pt}
+ 
+ @end ifhtml
+ 
+@@ -178,7 +178,7 @@ contents.
+ @ifhtml
+ The next figure shows the enter word dialog.
+ 
+-@image{../img/ss_worddlg, 250pt}
++@image{img/ss_worddlg, 250pt}
+ 
+ @end ifhtml
+ 
+@@ -203,7 +203,7 @@ The second notebook's page, dubbed Source, shows you the MIXAL source of
+ the currently loaded MIX file.
+ 
+ @ifhtml
+-@image{../img/ss_mixal, 400pt}
++@image{img/ss_mixal, 400pt}
+ @end ifhtml
+ 
+ The information is presented in four columns. The first column
+@@ -228,7 +228,7 @@ program.
+ 
+ @ifhtml
+ 
+-@image{../img/ss_devices, 400pt}
++@image{img/ss_devices, 400pt}
+ 
+ @end ifhtml
+ 
+@@ -303,7 +303,7 @@ list}}.
+ 
+ @ifhtml
+ 
+-@image{../img/ss_symbols, 250pt}
++@image{img/ss_symbols, 250pt}
+ 
+ @end ifhtml
+ 
+@@ -335,7 +335,7 @@ Opens a dialog that lets you specify which format shall be used to show
+ the contents of MIX binary block devices.
+ 
+ @ifhtml
+-@image{../img/ss_devform, 250pt}
++@image{img/ss_devform, 250pt}
+ @end ifhtml
+ 
+ The available formats are decimal (e.g. @w{-1234}) and MIX word
+@@ -347,7 +347,7 @@ Opens a dialog that lets you choose where the MIX device files will be
+ stored (@file{~/.mdk} is the default location).
+ 
+ @ifhtml
+-@image{../img/ss_devdir, 250pt}
++@image{img/ss_devdir, 250pt}
+ @end ifhtml
+ 
+ You can also specify the devices directory using the @code{mixvm}
+@@ -360,7 +360,7 @@ This menu command opens a dialog that lets you specify the commands used
+ for editing and compiling MIXAL source files.
+ 
+ @ifhtml
+-@image{../img/ss_extprog, 250pt}
++@image{img/ss_extprog, 250pt}
+ @end ifhtml
+ 
+ The commands are specified as template strings, where the control
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..040f8ff
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+img-path.patch
+typos.patch
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
new file mode 100644
index 0000000..a6fb59f
--- /dev/null
+++ b/debian/patches/typos.patch
@@ -0,0 +1,739 @@
+From 5a650249f7bca68f336d7414b3967672ee7d43ec Mon Sep 17 00:00:00 2001
+From: Peter Pentchev <roam@ringlet.net>
+Date: Wed, 10 Jan 2018 17:09:10 +0200
+Subject: Correct some typographical and grammatical errors.
+
+At least two typos in the intl/ directory were left as-is, since
+this seems to be imported libintl source code.
+
+Forwarded: not-yet
+Author: Peter Pentchev <roam@ringlet.net>
+Last-Update: 2016-11-12
+Patch-Name: typos.patch
+---
+ ChangeLog.2               |   2 +-
+ INSTALL                   |  16 ++++----
+ NEWS                      |   2 +-
+ THANKS                    |   2 +-
+ doc/MIX.DOC               |   4 +-
+ doc/mdk_gmixvm.texi       |   2 +-
+ doc/mdk_mixguile.texi     |   2 +-
+ doc/mdk_tut.texi          |   4 +-
+ misc/mixal-mode.el        | 100 +++++++++++++++++++++++-----------------------
+ mixguile/mixguile.c       |   2 +-
+ mixguile/mixguile.h       |   2 +-
+ mixlib/mix_eval.c         |   2 +-
+ mixlib/mix_eval.h         |   2 +-
+ mixlib/mix_symbol_table.c |   2 +-
+ mixlib/mix_symbol_table.h |   2 +-
+ mixlib/mix_types.h        |   2 +-
+ mixlib/mix_vm.c           |   2 +-
+ mixlib/xmix_vm.h          |   2 +-
+ po/de.po                  |   2 +-
+ 19 files changed, 77 insertions(+), 77 deletions(-)
+
+diff --git a/ChangeLog.2 b/ChangeLog.2
+index fb8cbb0..3378678 100644
+--- a/ChangeLog.2
++++ b/ChangeLog.2
+@@ -50,7 +50,7 @@
+ 
+        * misc/mixal-mode.el: -g option no longer needed on compilation.
+ 
+-       * doc/mdk_mixasm.texi: fix of grammer mistake.
++       * doc/mdk_mixasm.texi: fix a grammar mistake.
+ 
+ 2005-03-26  Sergey Poznyakoff  <gray@gnu.org>
+ 
+diff --git a/INSTALL b/INSTALL
+index 76e3e73..9cfe2df 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -4,7 +4,7 @@ Installing MDK
+ Download the source tarball
+ ===========================
+ 
+-   GNU MDK is distributed as a source tarball available for download in
++   GNU MDK is distributed as a source tarball available for download at
+ the following URLs:
+ 
+    * <ftp://ftp.gnu.org/pub/gnu/mdk> (or one of its mirrors
+@@ -48,7 +48,7 @@ libraries installed in your system:
+    - GNU Libguile 2.0.x (http://www.gnu.org/software/guile) (optional)
+ 
+    If present, readline and history are used to provide command
+-completion and history management to the command line MIX virtual
++completion and history management to the command-line MIX virtual
+ machine, `mixvm'.  GTK+ and libglade are needed if you want to build
+ the graphical interface to the MIX virtual machine, `gmixvm'. Finally,
+ if libguile is found, the MDK utilities will be compiled with Guile
+@@ -74,7 +74,7 @@ where the last one must be run as root.
+ 
+    The first command, `configure', will setup the makefiles for your
+ system. In particular, `configure' will look for GTK+ and libglade,
+-and, if they are present, will generate the appropiate makefiles for
++and, if they are present, will generate the appropriate makefiles for
+ building the `gmixvm' graphical user interface. Upon completion, you
+ should see a message with the configuration results like the following:
+ 
+@@ -87,7 +87,7 @@ should see a message with the configuration results like the following:
+          - gmixvm (mixvm GTK+ GUI, with guile support)
+          - mixguile (the mixvm guile shell)
+ 
+-where the last lines may be missing if you lack the above mentioned
++where the last lines may be missing if you lack the above-mentioned
+ libraries.
+ 
+    The next command, `make', will actually build the MDK programs in
+@@ -102,14 +102,14 @@ the following locations:
+    - `mixguile/mixguile'
+ 
+    You can run these programs from within their directories, but I
+-recommend you to install them in proper locations using `make install'
++recommend that you install them in the proper locations using `make install'
+ from a root shell.
+ 
+ Emacs support
+ =============
+ 
+    `mixvm' can be run within an Emacs GUD buffer using the elisp
+-program `misc/mixvm.el', kindly contributed by {No value for `PHILIP'}.
++program `misc/mixvm.el', kindly contributed by Philip Ellis King.
+ 
+    `mixvm.el' provides an interface between MDK's `mixvm' and Emacs,
+ via GUD.  Place this file in your load-path, optionally adding the
+@@ -120,8 +120,8 @@ following line to your `.emacs' file:
+ Special configure flags
+ =======================
+ 
+-   You can fine tunning the configuration process using the following
+-switches with configure:
++   You can fine-tune the configuration process using the following
++switches for configure:
+ 
+  - User Option: -enable-gui[=yes|no]
+  - User Option: -disable-gui
+diff --git a/NEWS b/NEWS
+index 05a0ddc..4dede0a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -116,7 +116,7 @@ Please send mdk bug reports to bug-mdk@gnu.org.
+    - cbpo help string corrected (thanks to Michael Vernov).
+    - I1 and I2 in mixvm swapped to their correct position (closes #15746).
+    - Obsolete CFLAGS for Darwin removed.
+-   - mixal-mode.el syncronised with Emacs CVS.
++   - mixal-mode.el synchronised with Emacs CVS.
+    - Segmentation fault when clicking Memory title (closes #15910).
+    - Writing to char devices caused an out-of-bounds array access
+      (thanks to Aleix Conchillo).
+diff --git a/THANKS b/THANKS
+index 859e4c5..8c72016 100644
+--- a/THANKS
++++ b/THANKS
+@@ -34,7 +34,7 @@ errors.
+      reviewed the MDK documentation, providing insightful advice.
+ 
+    * Eric S. Raymond contributed the documentation file doc/MIX.DOC
+-     and the samples sample/elevator.mixal, sample/mistery.mixal from
++     and the samples sample/elevator.mixal, sample/mystery.mixal from
+      his MIXAL package.
+ 
+    * Ryan Schmidt, Agustin Navarro (<anp@cantv.net>), Ying-Chieh Liao
+diff --git a/doc/MIX.DOC b/doc/MIX.DOC
+index b1f7d62..16f23b2 100644
+--- a/doc/MIX.DOC
++++ b/doc/MIX.DOC
+@@ -44,7 +44,7 @@ is used in connection with rA to hold ten bytes of a product or dividend, or
+ it can be used to hold information shifted to the right out of rA.  The index
+ registers rI1, rI2, rI3, rI4, rI5, and rI6 are used primarily for counting and
+ for referencing variable memory addresses.  The J-register always hold the
+-address of the instruction following the preceding ``JUMP'' intruction, and it
++address of the instruction following the preceding ``JUMP'' instruction, and it
+ is primarily used in connection with subroutines.
+     Besides thesee registers, MIX contains
+     
+@@ -124,7 +124,7 @@ portion; and I, F represent the I- and F-fields, respectively.
+     If I is zero, the ``,I'' is omitted.  If F is the -normal- F-specification
+ for this particular operator, the ``(F)'' need not be written.  The normal F-
+ specification for almost all operators is (0:5), representing a whole word.
+-If a different F is standard, it will be mentioned explicity when we discuss
++If a different F is standard, it will be mentioned explicitly when we discuss
+ a particular operator.
+ 
+ ...
+diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
+index d866cc7..6b8f3e5 100644
+--- a/doc/mdk_gmixvm.texi
++++ b/doc/mdk_gmixvm.texi
+@@ -325,7 +325,7 @@ page.
+ 
+ @deffn Settings @w{Change font}
+ Lets you change the font used in the various @code{gmixv} widgets
+-(i.e. commad prompt, command log, Virtual machine, Source, Devices and
++(i.e. command prompt, command log, Virtual machine, Source, Devices and
+ Symbol list). There is also an entry (@code{All}) to change all fonts
+ at once.
+ @end deffn
+diff --git a/doc/mdk_mixguile.texi b/doc/mdk_mixguile.texi
+index 5566a16..2627857 100644
+--- a/doc/mdk_mixguile.texi
++++ b/doc/mdk_mixguile.texi
+@@ -288,7 +288,7 @@ string list with its arguments.
+ 
+ @defun mix-add-break-hook hook
+ @defunx mix-add-cond-break hook
+-Add a hook funtion to be executed when an explicit (resp. conditional)
++Add a hook function to be executed when an explicit (resp. conditional)
+ breakpoint is encountered during program execution. @var{hook} is a
+ function taking two arguments: the source line number where the hook has
+ occurred, and the current program counter value. The following code
+diff --git a/doc/mdk_tut.texi b/doc/mdk_tut.texi
+index e2d3a15..ada5b7d 100644
+--- a/doc/mdk_tut.texi
++++ b/doc/mdk_tut.texi
+@@ -397,7 +397,7 @@ The following instructions are the inverse of the load
+ operations: they are used to store a subfield of a register
+ into a memory location. Here, MOD represents the subfield of the memory
+ cell that is to be overwritten with bytes from a register. These bytes
+-are taken beginning by the rightmost side of the register.
++are taken starting with the rightmost side of the register.
+ 
+ @ftable @code
+ @item STA
+@@ -823,7 +823,7 @@ counter, while @samp{HLT} usually marks program termination.
+ @comment  node-name,  next,  previous,  up
+ @subsubsection Execution times
+ 
+-@cindex exection time
++@cindex execution time
+ @cindex time
+ 
+ When writing MIXAL programs (or any kind of programs, for that
+diff --git a/misc/mixal-mode.el b/misc/mixal-mode.el
+index a2eaafb..1dfe082 100644
+--- a/misc/mixal-mode.el
++++ b/misc/mixal-mode.el
+@@ -162,7 +162,7 @@ about the time it takes, number or string.")
+ ; (makunbound 'mixal-operation-codes-alist)
+ 
+ (defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
+-  "Add an operation code to the list that contains information about possible op code's."
++  "Add an operation code to the list that contains information about possible opcodes."
+   (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte
+ 						description execution-time)
+ 					  mixal-operation-codes-alist )))
+@@ -188,7 +188,7 @@ zeros to make a word."
+  "Put in rI1 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -196,7 +196,7 @@ to set anything more that that will result in undefined behavior."
+  "Put in rI2 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -204,7 +204,7 @@ to set anything more that that will result in undefined behavior."
+  "Put in rI3 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -212,7 +212,7 @@ to set anything more that that will result in undefined behavior."
+  "Put in rI4 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -220,7 +220,7 @@ to set anything more that that will result in undefined behavior."
+  "Put in rI5 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -228,7 +228,7 @@ to set anything more that that will result in undefined behavior."
+  "Put in rI6 the contents of cell no. M.
+ Uses a + when there is no sign in subfield. Subfield is left padded with
+ zeros to make a word. Index registers only have 2 bytes and a sign, Trying
+-to set anything more that that will result in undefined behavior."
++to set anything more than that will result in undefined behavior."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -250,7 +250,7 @@ Subfield is left padded with zeros to make a word."
+  "Put in rI1 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -259,7 +259,7 @@ in undefined behavior."
+  "Put in rI2 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -268,7 +268,7 @@ in undefined behavior."
+  "Put in rI3 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -277,7 +277,7 @@ in undefined behavior."
+  "Put in rI4 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -286,7 +286,7 @@ in undefined behavior."
+  "Put in rI5 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -295,7 +295,7 @@ in undefined behavior."
+  "Put in rI6 the contents of cell no. M, with opposite sign.
+ Uses a + when there is no sign in subfield, otherwise use the opposite sign.
+ Subfield is left padded with zeros to make a word. Index registers only
+-have 2 bytes and a sign, Trying to set anything more that that will result
++have 2 bytes and a sign, Trying to set anything more than that will result
+ in undefined behavior."
+  2)
+ 
+@@ -304,7 +304,7 @@ in undefined behavior."
+  "Store in cell Nr. M the contents of rA.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield."
+  2)
+ 
+@@ -313,7 +313,7 @@ sign of the memory cell is not changed, unless it is part of the subfield."
+  "Store in cell Nr. M the contents of rX.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield."
+  2)
+ 
+@@ -322,7 +322,7 @@ sign of the memory cell is not changed, unless it is part of the subfield."
+  "Store in cell Nr. M the contents of rI1.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -333,7 +333,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rI2.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -344,7 +344,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rI3.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -355,7 +355,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rI4.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -366,7 +366,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rI5.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -377,7 +377,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rI6.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The
++bytes are taken starting with the rightmost side of the register. The
+ sign of the memory cell is not changed, unless it is part of the subfield.
+ Because index registers only have 2 bytes and a sign, the rest of the bytes
+ are assumed to be 0."
+@@ -388,7 +388,7 @@ are assumed to be 0."
+  "Store in cell Nr. M the contents of rJ.
+ The modification of the operation code represents the subfield of the
+ memory cell that is to be overwritten with bytes from a register. These
+-bytes are taken beginning by the rightmost side of the register. The sign
++bytes are taken starting with the rightmost side of the register. The sign
+ of rJ is always +, sign of the memory cell is not changed, unless it is
+ part of the subfield. The default field for STJ is (0:2)."
+  2)
+@@ -404,7 +404,7 @@ memory cell that is to be overwritten with zeros."
+  'ADD 'arithmetic "add" 1 'field
+  "Add to A the contents of cell Nr. M.
+ Subfield is padded with zero to make a word.
+-If the result is to large, the operation result modulo 1,073,741,823 (the
++If the result is too large, the operation result modulo 1,073,741,823 (the
+ maximum value storable in a MIX word) is stored in `rA', and the overflow
+ toggle is set to TRUE."
+  2)
+@@ -413,7 +413,7 @@ toggle is set to TRUE."
+  'SUB 'arithmetic "subtract" 2 'field
+  "Subtract to A the contents of cell Nr. M.
+ Subfield is padded with zero to make a word.
+-If the result is to large, the operation result modulo 1,073,741,823 (the
++If the result is too large, the operation result modulo 1,073,741,823 (the
+ maximum value storable in a MIX word) is stored in `rA', and the overflow
+ toggle is set to TRUE."
+  2)
+@@ -427,8 +427,8 @@ The sign is + if the sign of rA and cell M where the same, otherwise, it is -"
+ (mixal-add-operation-code
+  'DIV 'arithmetic "divide" 4 'field
+  "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
+-The sign is taken from rA, and after the divide the sign of rA is set to + when
+-both the sign of rA and M where the same. Divide by zero and overflow of rA result
++The sign is taken from rA, and after the division the sign of rA is set to + when
++both the signs of rA and M where the same. Divide by zero and overflow of rA result
+ in undefined behavior."
+  12)
+ 
+@@ -656,7 +656,7 @@ is set to LESS, EQUAL or GREATER depending on the outcome."
+  'CMP1 'comparison "compare I1" (+ 56 1) 'field
+  "Compare contents of rI1 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -665,7 +665,7 @@ have a value of 0."
+  'CMP2 'comparison "compare I2" (+ 56 2) 'field
+  "Compare contents of rI2 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -674,7 +674,7 @@ have a value of 0."
+  'CMP3 'comparison "compare I3" (+ 56 3) 'field
+  "Compare contents of rI3 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -683,7 +683,7 @@ have a value of 0."
+  'CMP4 'comparison "compare I4" (+ 56 4) 'field
+  "Compare contents of rI4 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -692,7 +692,7 @@ have a value of 0."
+  'CMP5 'comparison "compare I5" (+ 56 5) 'field
+  "Compare contents of rI5 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -701,7 +701,7 @@ have a value of 0."
+  'CMP6 'comparison "compare I6" (+ 56 6) 'field
+  "Compare contents of rI6 with contents of M.
+ The field specifier works on both fields. The comparison indicator
+-is set to LESS, EQUAL or GREATER depending on the outcome. Bit 1,2 and 3
++is set to LESS, EQUAL or GREATER depending on the outcome. Bits 1, 2 and 3
+ have a value of 0."
+  2)
+ 
+@@ -1188,21 +1188,21 @@ been executed when there was no jump."
+ 
+ (mixal-add-operation-code
+  'SLA 'miscellaneous "shift left A" 6 0
+- "Shift to A, M bytes left.
+-Hero's will be added to the right."
++ "Shift A, M bytes to the left.
++Zeros will be added to the right."
+  2)
+ 
+ 
+ (mixal-add-operation-code
+  'SRA 'miscellaneous "shift right A" 6 1
+- "Shift to A, M bytes right.
++ "Shift A, M bytes to the right.
+ Zeros will be added to the left."
+  2)
+ 
+ 
+ (mixal-add-operation-code
+  'SLAX 'miscellaneous "shift left AX" 6 2
+- "Shift AX, M bytes left.
++ "Shift AX, M bytes to the left.
+ Zeros will be added to the right."
+  2)
+ 
+@@ -1210,32 +1210,32 @@ Zeros will be added to the right."
+ 
+ (mixal-add-operation-code
+  'SRAX 'miscellaneous "shift right AX" 6 3
+- "Shift AX, M bytes right.
++ "Shift AX, M bytes to the right.
+ Zeros will be added to the left."
+  2)
+ 
+ 
+ (mixal-add-operation-code
+  'SLC 'miscellaneous "shift left AX circularly" 6 4
+- "Shift AX, M bytes left circularly.
+-The bytes that fall off to the left will be added to the right."
++ "Shift AX, M bytes to the left circularly.
++The bits that fall off on the left will be added to the right."
+  2)
+ 
+ 
+ (mixal-add-operation-code
+  'SRC 'miscellaneous "shift right AX circularly" 6 4
+- "Shift AX, M bytes right circularly.
+-The bytes that fall off to the right will be added to the left."
++ "Shift AX, M bytes to the right circularly.
++The bytes that fall off on the right will be added to the left."
+  2)
+ 
+ (mixal-add-operation-code
+  'SLB 'miscellaneous "shift left AX binary" 6 6
+- "Shift AX, M binary places left."
++ "Shift AX, M binary places to the left."
+  2)
+ 
+ (mixal-add-operation-code
+  'SRB 'miscellaneous "shift right AX binary" 6 7
+- "Shift AX, M binary places right."
++ "Shift AX, M binary places to the right."
+  2)
+ 
+ (mixal-add-operation-code
+@@ -1285,15 +1285,15 @@ The control operation is given by M on the specified unit."
+ 
+ (mixal-add-operation-code
+  'NUM 'conversion "convert to numeric" 5 0
+- "Convert rAX to its numerical value and store it in rA.
+-the register rAX is assumed to contain a character representation of
++ "Convert rAX to its numerical value and store it into rA.
++The register rAX is assumed to contain a character representation of
+ a number."
+  10)
+ 
+ (mixal-add-operation-code
+  'CHAR 'conversion "convert to characters" 5 1
+  "Convert the number stored in rA to a character representation.
+-The converted character representation is stored in rAX."
++The converted character representation is stored into rAX."
+  10)
+ 
+ (defvar mixal-describe-operation-code-history nil
+@@ -1302,15 +1302,15 @@ The converted character representation is stored in rAX."
+ (defun mixal-describe-operation-code (&optional op-code)
+   "Display the full documentation of OP-CODE."
+   (interactive)
+-  ;; we like to provide completition and history, so do it ourself (interactive "?bla")?
++  ;; we like to provide completion and history, so do it ourself (interactive "?bla")?
+   (unless op-code
+     (let* ((completion-ignore-case t)
+ 	   ;; we already have a list, but it is not in the right format
+-	   ;; transform it to a valid table so completition can use it
++	   ;; transform it to a valid table so completion can use it
+ 	   (table (mapcar '(lambda (elm)
+ 			     (cons (symbol-name (car elm)) nil))
+ 			  mixal-operation-codes-alist))
+-	   ;; prompt is different depending on we are close to a valid op-code
++	   ;; prompt is different depending on whether we are close to a valid op-code
+ 	   (have-default (member (current-word) mixal-operation-codes))
+ 	   (prompt (concat "Describe operation code "
+ 			   (if have-default
+@@ -1334,7 +1334,7 @@ The converted character representation is stored in rAX."
+ 
+ ;;;; Running
+ (defun mixal-run ()
+-  "Run's mixal file in current buffer, assumes that file has been compiled"
++  "Runs mixal file in current buffer, assumes that file has been compiled"
+   (interactive)
+   (mixvm (concat "mixvm -r -t -d "
+ 		 (file-name-sans-extension (buffer-file-name)))))
+diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c
+index 866fd6d..3ef1e32 100644
+--- a/mixguile/mixguile.c
++++ b/mixguile/mixguile.c
+@@ -101,7 +101,7 @@ mixguile_set_cmd_dispatcher (mix_vm_cmd_dispatcher_t *dis)
+   g_assert (dispatcher_);
+ }
+ 
+-/* access the mixguile comand dispatcher */
++/* access the mixguile command dispatcher */
+ mix_vm_cmd_dispatcher_t *
+ mixguile_get_cmd_dispatcher (void)
+ {
+diff --git a/mixguile/mixguile.h b/mixguile/mixguile.h
+index d122d44..5ee13a7 100644
+--- a/mixguile/mixguile.h
++++ b/mixguile/mixguile.h
+@@ -58,7 +58,7 @@ mixguile_set_cmd_dispatcher (mix_vm_cmd_dispatcher_t *dis);
+ extern void
+ mixguile_enter_repl (void *closure, int argc, char *argv[]);
+ 
+-/* access the comand dispatcher */
++/* access the command dispatcher */
+ extern mix_vm_cmd_dispatcher_t *
+ mixguile_get_cmd_dispatcher (void);
+ 
+diff --git a/mixlib/mix_eval.c b/mixlib/mix_eval.c
+index 64ae476..a942bdb 100644
+--- a/mixlib/mix_eval.c
++++ b/mixlib/mix_eval.c
+@@ -183,7 +183,7 @@ mix_eval_remove_symbols_from_table (mix_eval_t *eval,
+ {
+   g_return_val_if_fail (eval != NULL, FALSE);
+   if (eval->table != NULL)
+-    return mix_symbol_table_substract_table (eval->table, table);
++    return mix_symbol_table_subtract_table (eval->table, table);
+   else
+     return FALSE;
+ }
+diff --git a/mixlib/mix_eval.h b/mixlib/mix_eval.h
+index 2a1672e..b1353e4 100644
+--- a/mixlib/mix_eval.h
++++ b/mixlib/mix_eval.h
+@@ -32,7 +32,7 @@ typedef struct mix_eval_t mix_eval_t;
+ 
+ /* possible evaluation outcomes*/
+ typedef enum {
+-  MIX_EVAL_OK, /* sucess*/
++  MIX_EVAL_OK, /* success*/
+   MIX_EVAL_SYNTAX, /* syntax error */
+   MIX_EVAL_INV_FSPEC, /* out of range fspec */
+   MIX_EVAL_MIS_PAREN, /* mismatched parenthesis */
+diff --git a/mixlib/mix_symbol_table.c b/mixlib/mix_symbol_table.c
+index 69bbd30..524b2db 100644
+--- a/mixlib/mix_symbol_table.c
++++ b/mixlib/mix_symbol_table.c
+@@ -97,7 +97,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
+ }
+ 
+ gboolean
+-mix_symbol_table_substract_table (mix_symbol_table_t *table,
++mix_symbol_table_subtract_table (mix_symbol_table_t *table,
+ 				  const mix_symbol_table_t *other)
+ {
+   g_return_val_if_fail (table != NULL, FALSE);
+diff --git a/mixlib/mix_symbol_table.h b/mixlib/mix_symbol_table.h
+index 904c828..b477879 100644
+--- a/mixlib/mix_symbol_table.h
++++ b/mixlib/mix_symbol_table.h
+@@ -53,7 +53,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
+ 			      const mix_symbol_table_t *from);
+ 
+ extern gboolean
+-mix_symbol_table_substract_table (mix_symbol_table_t *table,
++mix_symbol_table_subtract_table (mix_symbol_table_t *table,
+ 				  const mix_symbol_table_t *other);
+ 
+ /* Add/remove symbols one by one */
+diff --git a/mixlib/mix_types.h b/mixlib/mix_types.h
+index 8bea145..7ffdb9d 100644
+--- a/mixlib/mix_types.h
++++ b/mixlib/mix_types.h
+@@ -50,7 +50,7 @@ typedef guint8 mix_byte_t;
+ /* Operations */
+ /* Addition */
+ #define mix_byte_add(x,y) mix_byte_new((x) + (y))
+-/* Substraction */
++/* Subtraction */
+ #define mix_byte_sub(x,y) mix_byte_new((x) - (y))
+ /* Product */
+ #define mix_byte_mul(x,y) mix_byte_new((x) * (y))
+diff --git a/mixlib/mix_vm.c b/mixlib/mix_vm.c
+index d714bba..7f8cd99 100644
+--- a/mixlib/mix_vm.c
++++ b/mixlib/mix_vm.c
+@@ -525,7 +525,7 @@ mix_vm_get_error_string (mix_vm_error_t code)
+     N_("Cannot access device for reading"),
+     N_("Cannot access device for writing"),
+     N_("Unexpected error"),
+-    N_("Unknow error code")
++    N_("Unknown error code")
+   };
+ 
+   return errors[code > MIX_VM_ERROR_UNEXPECTED ?
+diff --git a/mixlib/xmix_vm.h b/mixlib/xmix_vm.h
+index 0d6605f..35f4259 100644
+--- a/mixlib/xmix_vm.h
++++ b/mixlib/xmix_vm.h
+@@ -52,7 +52,7 @@ struct mix_vm_t
+   mix_device_t * devices[BD_NO_];
+   mix_address_t start_addr;	/* start address of loaded file */
+   GTree *line_table;		/* source line no -> address  */
+-  GTree *address_table;		/* adress -> source line no */
++  GTree *address_table;		/* address -> source line no */
+   gint8 bp[MEM_CELLS_NO_/8];	/* each bit signals a break point */
+   mix_vm_clock_t *clock;		/* the vm clock */
+   mix_symbol_table_t *symbol_table;
+diff --git a/po/de.po b/po/de.po
+index 3df6691..63f6ad0 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -304,7 +304,7 @@ msgstr "Register I%d ge
+ #: mixlib/mix_predicate.c:197
+ #, c-format
+ msgid "Comparison flag changed to %s"
+-msgstr "Comparision Flag geändert zu %s"
++msgstr "Comparison Flag geändert zu %s"
+ 
+ #: mixlib/mix_predicate.c:201
+ #, c-format