Blob Blame Raw
diff -uNr Argyll_V1.0.1.orig/doc/ArgyllDoc.html Argyll_V1.0.1/doc/ArgyllDoc.html
--- Argyll_V1.0.1.orig/doc/ArgyllDoc.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ArgyllDoc.html	2008-07-27 11:39:29.000000000 +0200
@@ -18,7 +18,7 @@
 Author: Graeme Gill
 <h2><u>Introduction</u></h2>
 Argyll is an open source, ICC compatible color management
-system. It supports accurate ICC profile creation for scanners, CMYK
+system. It supports accurate ICC profile creation for acquisition devices, CMYK
 printers,
 film recorders and calibration and profiling of displays.
 Spectral sample data is supported,
diff -uNr Argyll_V1.0.1.orig/doc/chartread.html Argyll_V1.0.1/doc/chartread.html
--- Argyll_V1.0.1.orig/doc/chartread.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/chartread.html	2008-07-27 11:40:27.000000000 +0200
@@ -206,7 +206,7 @@
 <br>
 <a name="a"></a> Normally the patch locations are not needed in the
 output, but if a chart is being read as an input reference (for use in
-profiling a scanner or a camera), then the patch locations will still
+profiling an acquisition device), then the patch locations will still
 be needed. The <span style="font-weight: bold;">-a</span> flag adds
 the locations to the output .ti3 file.<br>
 <br>
diff -uNr Argyll_V1.0.1.orig/doc/colprof.html Argyll_V1.0.1/doc/colprof.html
--- Argyll_V1.0.1.orig/doc/colprof.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/colprof.html	2008-07-27 11:41:01.000000000 +0200
@@ -617,8 +617,8 @@
 absolute value, and any values whiter than that, will not be clipped by
 the profile. The profile effectively operates in an absolute intent
 mode, &nbsp;irrespective of what intent is selected when it is used.
-This flag can be useful when an input profile is needed for using a
-scanner as a "poor mans" colorimeter, or if the white point of the test
+This flag can be useful when an input profile is needed for using an
+acquisition device as a "poor mans" colorimeter, or if the white point of the test
 chart doesn't represent the white points of media
 that will be used in practice, and that white point adjustment will be
 done individually in some downstream application.<br>
diff -uNr Argyll_V1.0.1.orig/doc/Installing_Linux.html Argyll_V1.0.1/doc/Installing_Linux.html
--- Argyll_V1.0.1.orig/doc/Installing_Linux.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_Linux.html	2008-07-27 11:42:29.000000000 +0200
@@ -30,7 +30,7 @@
 variable to give access to the executables from your command line
 environment.
 The .tgz file also contains several useful reference files (such as
-scanner
+acquisition device
 chart recognition templates, sample illumination spectrum etc.) in the
 ref sub-directory, as
 well
diff -uNr Argyll_V1.0.1.orig/doc/Installing_MSWindows.html Argyll_V1.0.1/doc/Installing_MSWindows.html
--- Argyll_V1.0.1.orig/doc/Installing_MSWindows.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_MSWindows.html	2008-07-27 11:42:50.000000000 +0200
@@ -69,7 +69,7 @@
 <br>
 The .zip file also contains several useful reference files
 (such as
-scanner
+acquisition device
 chart recognition templates, sample illumination spectrum etc.) in the
 ref sub-directory, all the current documentation in a doc
 sub-directory, and instrument USB drivers in the libusbw directory.<br>
diff -uNr Argyll_V1.0.1.orig/doc/Installing_OSX.html Argyll_V1.0.1/doc/Installing_OSX.html
--- Argyll_V1.0.1.orig/doc/Installing_OSX.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Installing_OSX.html	2008-07-27 11:39:58.000000000 +0200
@@ -30,7 +30,7 @@
 with how to do this, consult an appropriate tutorial, e.g. &lt;<a
  href="http://heather.cs.ucdavis.edu/%7Ematloff/UnixAndC/Unix/ShellIntro.html#tth_sEc1">ShellIntro</a>&gt;.
 The .tgz file also contains several useful reference files (such as
-scanner chart recognition templates, sample illumination spectrum
+acquisition device chart recognition templates, sample illumination spectrum
 etc.) in the ref sub-directory, as well as
 all the current documentation in a doc sub-directory.<br>
 <br>
diff -uNr Argyll_V1.0.1.orig/doc/Organisation.html Argyll_V1.0.1/doc/Organisation.html
--- Argyll_V1.0.1.orig/doc/Organisation.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Organisation.html	2008-07-27 11:36:55.000000000 +0200
@@ -13,7 +13,7 @@
 This directory contains routines that generate calibration test charts,
 based
 on various distribution algorithms suitable for
-reading using an Xrite DTP51 or DTP41 colorimeter, or scanner for print
+reading using an Xrite DTP51 or DTP41 colorimeter, or acquisition device for print
 charts,
 the Gretag Spectrolino for film charts, or the Xrite DTP92 pr DTP94 for
 monitor
diff -uNr Argyll_V1.0.1.orig/doc/printtarg.html Argyll_V1.0.1/doc/printtarg.html
--- Argyll_V1.0.1.orig/doc/printtarg.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/printtarg.html	2008-07-27 11:36:27.000000000 +0200
@@ -167,7 +167,7 @@
 file, and a .ti2 file containing the device test values together with
 the layout information needed to identify the patch location. This
 module can also generate the image recognition templates needed to read
-the print targets in using a scanner.<br>
+the print targets in using an acquisition device.<br>
 <br>
 <a name="v"></a> The <b>-v</b> flag turns on verbose mode. Prints
 information about how many patches there are in a row, how many patches
diff -uNr Argyll_V1.0.1.orig/doc/scanin.html Argyll_V1.0.1/doc/scanin.html
--- Argyll_V1.0.1.orig/doc/scanin.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/scanin.html	2008-07-27 11:34:18.000000000 +0200
@@ -23,7 +23,7 @@
 recogin.cht
 valin.cie [diag.tif]</span><br style="font-family: monospace;">
 <span style="font-family: monospace;">&nbsp;&nbsp; :- inputs
-'input.tif',&nbsp; and outputs scanner
+'input.tif',&nbsp; and outputs device
 'input.ti3', or</span><br style="font-family: monospace;">
 <br style="font-family: monospace;">
 <a style="font-family: monospace;" href="#g"> usage</a><span
@@ -85,7 +85,7 @@
  style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 Replace device values in .ti3</span><br style="font-family: monospace;">
 <span style="font-family: monospace;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-Default is to create a scanner .ti3 file<br>
+Default is to create a device .ti3 file<br>
 </span></small><small><span style="font-family: monospace;">&nbsp;</span><a
  style="font-family: monospace;" href="#F">-F x1,y1,x2,y2,x3,y3,x4,y4</a><span
  style="font-family: monospace;"> <br>
@@ -187,10 +187,10 @@
 of the chart are visible within the image, and if the image is cropped
 to exclude the chart edges, it may well not recognize the chart
 properly. It is designed to cope with a variety of resolutions, and
-will cope with some degree of noise in the scan (due to screening
+will cope with some degree of noise in the acquisition (due to screening
 artefacts on the original, or film grain), but it isn't really designed
 to accept very high resolution input. For anything over 600DPI, you
-should consider down sampling the scan using a filtering downsample,
+should consider down sampling the image using a filtering downsample,
 before submitting the file to scanin.<br>
 <br>
 There are 5 basic modes that <b>scanin</b> operates in.<br>
@@ -199,7 +199,7 @@
 assumed to be parsing an input device characterization chart (ie. an
 IT8.7/2 chart), for the purpose of creating a <a
  href="File_Formats.html#.ti3">.ti3</a> data file containing
-the CIE test values and the corresponding RGB scanner values. The <a
+the CIE test values and the corresponding RGB device values. The <a
  href="File_Formats.html#.ti3">.ti3</a> file can then be used for
 creating
 an input profile using <a href="colprof.html">colprof</a>. The file
@@ -221,7 +221,7 @@
 file in
 this situation, should be a good quality image, perhaps synthetically
 generated
-(rather than being scanned), and perfectly oriented, to make
+(rather than being parsed), and perfectly oriented, to make
 specification
 of the patch locations easier. The file arguments are: <a name="gp1"></a>The
 TIFF file that
@@ -245,7 +245,7 @@
 input devices to be used as a crude replacement for a color measuring
 instrument. The icc profile has
 (presumably) been
-created by scanning an IT8.7/2 chart (or similar) through the RGB input
+created with an image of a IT8.7/2 chart (or similar) through the RGB input
 device,
 and
 then using scanin to create the .ti3 file needed to feed to colprof to
@@ -267,7 +267,7 @@
 The resulting .ti3 file will have the same base name as the input TIFF
 file.
 If there is more than one page in the test chart, then scanin will need
-to be run multiple times, once for each scan file made from each test
+to be run multiple times, once for each image file made from each test
 chart. <a name="ca"></a>The <b>-ca</b> flag combination should be
 used
 for all pages after the first,
@@ -339,7 +339,7 @@
 <br>
 <a name="p"></a>By default the automatic chart recognition copes with
 rotation, scale and stretch in the chart image, making it suitable for
-charts that have been scanned, or shot squarely with a camera. If a
+charts that have been acquired, or shot squarely with a camera. If a
 chart has been shot not exactly facing the camera (perhaps to avoid
 reflection, or to get more even lighting), then it will suffer from
 perspective distortion as well. The <span style="font-weight: bold;"><span
@@ -349,7 +349,7 @@
 <a name="m"></a>Normally scanin computes an average of the pixel values
 within a sample square, using a "robust" mean, that discards pixel
 values that are too far from the average ("outlier" pixel values). This
-is done in an attempt to discard value that are due to scanning
+is done in an attempt to discard value that are due to acquisition
 artefacts such as dust, scratches etc. You can force scanin to return
 the true mean values for the sample squares that includes all the pixel
 values, by using the <span style="font-weight: bold;">-m</span> flag.<br>
@@ -357,9 +357,9 @@
 <a name="G"></a>Normally scanin has reasonably robust feature
 recognition, but the default assumption is that the input chart has an
 approximately even visual distribution of patch values, and has been
-scanned and converted to a typical gamma 2.2 corrected image, meaning
+acquired and converted to a typical gamma 2.2 corrected image, meaning
 that the average patch pixel value is expected to be about 50%. If this
-is not the case (for instance if the input chart has been scanned with
+is not the case (for instance if the input chart has been processed with
 linear light or "raw" encoding), then it may enhance the image
 recognition to provide the approximate gamma encoding of the image. For
 instance, if linear light encoding ("Raw") is used, a <span
diff -uNr Argyll_V1.0.1.orig/doc/Scenarios.html Argyll_V1.0.1/doc/Scenarios.html
--- Argyll_V1.0.1.orig/doc/Scenarios.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/Scenarios.html	2008-07-27 11:52:05.000000000 +0200
@@ -32,17 +32,17 @@
  href="#PM5">Installing a
 display profile</a></h4>
 <h4><br>
-<a href="#PS1">Profiling Scanners</a></h4>
+<a href="#PS1">Profiling Acquisition Devices</a></h4>
 <h4>&nbsp;&nbsp;&nbsp; <a href="#PS2">Types of test charts</a></h4>
-<h4>&nbsp;&nbsp;&nbsp; <a href="#PS3">Taking readings from a scanner</a></h4>
-<h4>&nbsp;&nbsp;&nbsp; <a href="#PS4">Creating a scanner profile</a></h4>
+<h4>&nbsp;&nbsp;&nbsp; <a href="#PS3">Taking readings from an acquisition device</a></h4>
+<h4>&nbsp;&nbsp;&nbsp; <a href="#PS4">Creating an acquisition device profile</a></h4>
 <h4><br>
 <a href="#PP1">Profiling Printers</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP2">Creating a print test chart</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP3">Reading a print test chart
 using an instrument</a></h4>
 <h4> &nbsp;&nbsp;&nbsp; <a href="#PP4">Reading a print test chart
-using a scanner</a></h4>
+using an acquisition device</a></h4>
 <h4> </h4>
 <h4>&nbsp;&nbsp;&nbsp; <a href="#PP5">Creating a printer profile<br>
 </a></h4>
@@ -353,14 +353,14 @@
 the connected display.<br>
 <br>
 <hr size="2" width="100%">
-<h3><a name="PS1"></a>Profiling Scanners</h3>
-Because a scanner is an input device, it is necessary to go about
+<h3><a name="PS1"></a>Profiling Acquisition Devices</h3>
+Because a acquisition device is an input device, it is necessary to go about
 profiling it in quite a different way to an output device. To profile
-it, a test chart is needed to exercise the scanner response, to which
+it, a test chart is needed to exercise the device response, to which
 the CIE values for each test patch is known. Generally standard
 reflection or transparency test charts are used for this purpose.<br>
 <h4><a name="PS2"></a>Types of test charts</h4>
-The most common and popular test chart for scanner profiling is the
+The most common and popular test chart for acquisiton device profiling is the
 IT8.7/2 chart. This is a standard format chart generally reproduced on
 photographic film, containing about 264 test patches. The Kodak Q-60
 Color Input Target is a typical example:<br>
@@ -400,18 +400,18 @@
 <img alt="CMP_DT_003" src="CMP_DT_003.jpg"
  style="width: 186px; height: 141px;"><br>
 <br>
-<h4><a name="PS3"></a>Taking readings from a scanner</h4>
-The test chart you are using needs to be placed on the scanner, and the
-scanner needs to be configured to a suitable state, and restored to
+<h4><a name="PS3"></a>Taking readings from an acquisition device</h4>
+The test chart you are using needs to be exposed to the device, and the
+acquisition device needs to be configured to a suitable state, and restored to
 that
 same state when used subsequently with the resulting profile. The chart
 should
 be scanned, and saved to a TIFF format file. I will assume the
 resulting
-file is called scanner.tif. The raster file need only be roughly
+file is called device.tif. The raster file need only be roughly
 cropped so as to contain the test chart (including the charts edges).<br>
 <br>
-The second step is to extract the RGB values from the scanner.tif file,
+The second step is to extract the RGB values from the device.tif file,
 and match then to the reference CIE values.
 To locate the patch values in the scan, the <b>scanin</b> utility
 needs to
@@ -485,32 +485,32 @@
 chart recognition template file will need to be created (this is beyond
 the scope of the current documentation).<br>
 <br>
-To create the scanner .ti3 file, run the <b>scanin</b> utility as
+To create the device .ti3 file, run the <b>scanin</b> utility as
 follows
 (assuming an IT8 chart is being used):<br>
 <br>
-<a href="scanin.html"> scanin</a> -v scanner.tif It8.cht It8ref.txt<br>
+<a href="scanin.html"> scanin</a> -v device.tif It8.cht It8ref.txt<br>
 <br>
 "It8ref.txt" is assumed to be the name of the CIE reference file
-supplied by the chart manufacturer. The resulting file will be named "<b>scanner.ti3</b>".<br>
+supplied by the chart manufacturer. The resulting file will be named "<b>device.ti3</b>".<br>
 <br>
 <span style="font-weight: bold;">scanin</span> will process 16 bit per
-component .tiff files, which (if the scanner is capable of creating
+component .tiff files, which (if the device is capable of creating
 such files),&nbsp; may improve the quality of the profile. <br>
 <br>
 If you have any doubts about the correctness of the chart recognition,
 or the subsequent profile's delta E report is unusual, then use the
 scanin diagnostic flags <a href="scanin.html#d">-dipn</a> and examine
 the <span style="font-weight: bold;">diag.tif</span> diagnostic file.<br>
-<h4><a name="PS4"></a>Creating a scanner profile</h4>
-Similar to a display profile, a scanner profile can be either a
-shaper/matrix or LUT based profile. Well behaved scanners will
+<h4><a name="PS4"></a>Creating an acquisition device profile</h4>
+Similar to a display profile, an acquisition device profile can be either a
+shaper/matrix or LUT based profile. Well behaved devices will
 probably give the best results
 with a shaper/matrix profile, but if the fit is poor, consider using a
 LUT
 type profile.<br>
 <br>
-If the purpose of the scanner profile is to use it as a substitute for
+If the purpose of the device profile is to use it as a substitute for
 a
 colorimeter, then the <b>-u</b> flag should be used to avoid clipping
 values above the white point. Unless the shaper/matrix type profile is
@@ -520,24 +520,24 @@
 To create a matrix/shaper profile, the following suffices:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner</a> <a href="colprof.html#E">A"</a> <a
+ href="colprof.html#E">-D"Device</a> <a href="colprof.html#E">A"</a> <a
  href="colprof.html#q">-qm</a> <a href="colprof.html#a">-as</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 For a LUT based profile then the following would be used:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner A"</a>
+ href="colprof.html#E">-D"Device A"</a>
 <a href="colprof.html#q">-qm</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 For the purposes of a poor mans colorimeter, the following would
 generally be used:<br>
 <br>
 <a href="colprof.html">colprof</a> <a href="colprof.html#v">-v</a> <a
- href="colprof.html#E">-D"Scanner A"</a>
+ href="colprof.html#E">-D"Device A"</a>
 <a href="colprof.html#q">-qm</a> <a href="colprof.html#u">-u</a>
-<a href="colprof.html#p1">scanner</a><br>
+<a href="colprof.html#p1">device</a><br>
 <br>
 Make sure you check the delta E report at the end of the profile
 creation, to see if the profile is behaving reasonably.<br>
@@ -703,7 +703,7 @@
 <a href="printtarg.html#i">-ii1</a> <a href="printtarg.html#p">-pA4</a>
 <a href="printtarg.html#p1">PrinterA</a><br>
 <br>
-For using with a scanner as a colorimeter, the Gretag Spectroscan
+For using with an acquisition device as a colorimeter, the Gretag Spectroscan
 layout is suitable, but the <a href="printtarg.html#s">-s</a> flag
 should be used so as to generate a layout suitable for scan
 recognition, as well as generating the scan recognition template
@@ -804,28 +804,27 @@
 for each type of instrument. Continue with <a href="Scenarios.html#PP5">Creating
 a printer profile</a>.<br>
 <br>
-<h4><a name="PP4"></a>Reading a print test chart using a scanner or
-camera<br>
+<h4><a name="PP4"></a>Reading a print test chart using an acquisition device<br>
 </h4>
 <br>
-Argyll supports using a scanner or even a camera as a substitute for a
+Argyll supports using any acquisition device as a substitute for a
 colorimeter.
-While a scanner or camera is no replacement for a color measurement
+While most are no replacement for a color measurement
 instrument, it may give acceptable results in some situations, and may
 give better results than a generic profile for a printing device.<br>
 <br>
-The main limitation of the scanner-as-colorimeter approach are:<br>
+The main limitation of the any-device-as-colorimeter approach are:<br>
 <br>
-* The scanner dynamic range and/or precision may not match the printers
+* The acquisition device dynamic range and/or precision may not match the printers
 or what is required for a good profile.<br>
-* The spectral interaction of the scanner test chart and printer test
-chart with the scanner
+* The spectral interaction of the device test chart and printer test
+chart with the device
 spectral response can cause color errors.<br>
 * Spectral differences caused by different black amounts in the print
 test chart can cause
 color errors. <br>
 * The IT8 chart gamut may be so much smaller than the printers that the
-scanner profile is too inaccurate. <br>
+acquisition device profile is too inaccurate. <br>
 <br>
 As well as some of the above, a camera may not be suitable if it
 automatically adjusts exposure or white point when taking a picture,
@@ -834,23 +833,23 @@
 The end result is often a profile that has a slight color cast to,
 compared to a profile created using a colorimeter or spectrometer..<br>
 <br>
-It is assumed that you have created a scanner or camera profile
+It is assumed that you have created an acquisition device profile
 following the <a href="http://www.argyllcms.com/doc/Scenarios.html#PS1">procedure</a>
 outline above. For best possible results it
-is advisable to both profile the scanner or camera, and use it in
+is advisable to both profile the acquisition device, and use it in
 scanning the
 printed test chart, in as "raw" mode as possible (i.e. using 16 bits
-per component images, if the scanner or camera is
+per component images, if the acquisition device is
 capable of doing so; not setting white or black points, using a fixed
 exposure etc.). It is
 generally advisable to create a LUT type input profile, and use the <a
  href="http://www.argyllcms.com/doc/colprof.html#u">-u</a> flag to
 avoid clipping scanned value whiter than the input calibration chart.<br>
 <br>
-Scan or photograph your printer chart (or charts) on the scanner or
-camera previously profiled.
+Scan or photograph your printer chart (or charts) on the acquisition device
+previously profiled.
 <big><span style="font-weight: bold;">The
-scanner or camera must be configured and used exactly the same as it
+acquisition device must be configured and used exactly the same as it
 was when it
 was profiled.</span></big><br>
 <br>
@@ -858,21 +857,21 @@
  style="font-weight: bold;">PrinterB.tif</span> (or <span
  style="font-weight: bold;">PrinterB1.tif</span>, <span
  style="font-weight: bold;">PrinterB2.tif</span> etc. in the case of
-multiple charts). As with profiling the scanner or camera, the raster
+multiple charts). As with profiling the acquisition device, the raster
 file need
 only be roughly cropped so as to contain the test chart.<br>
 <br>
-The scanner recognition files
+The acquisition device recognition files
 created when <span style="font-weight: bold;">printtarg</span> was run
 is assumed to be called <span style="font-weight: bold;">PrinterB.cht</span>.
-Using the scanner profile created previously (assumed to be called <span
- style="font-weight: bold;">scanner.icm</span>), the printer test chart
+Using the device profile created previously (assumed to be called <span
+ style="font-weight: bold;">device.icm</span>), the printer test chart
 scan patches are converted to CIE values using the <span
  style="font-weight: bold;">scanin</span> utility:<br>
 <br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#c">-c</a> <a href="scanin.html#cp1">PrinterB.tif</a>
-<a href="scanin.html#cp2">PrinterB.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <br>
 If there were multiple test chart pages, the results would be
@@ -881,15 +880,15 @@
 <br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#c">-c</a> <a href="scanin.html#cp1">PrinterB1.tif</a>
-<a href="scanin.html#cp2">PrinterB1.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB1.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#ca">-ca</a> <a href="scanin.html#cp1">PrinterB2.tif</a>
-<a href="scanin.html#cp2">PrinterB2.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB2.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <a href="scanin.html">scanin</a> <a href="scanin.html#v">-v</a> <a
  href="scanin.html#ca">-ca</a> <a href="scanin.html#cp1">PrinterB3.tif</a>
-<a href="scanin.html#cp2">PrinterB3.cht</a> <a href="scanin.html#cp3">scanner.icm</a>
+<a href="scanin.html#cp2">PrinterB3.cht</a> <a href="scanin.html#cp3">device.icm</a>
 <a href="scanin.html#cp4">PrinterB</a><br>
 <br>
 Now that the <span style="font-weight: bold;">PrinterB.ti3</span> data
diff -uNr Argyll_V1.0.1.orig/doc/targen.html Argyll_V1.0.1/doc/targen.html
--- Argyll_V1.0.1.orig/doc/targen.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/targen.html	2008-07-27 11:53:34.000000000 +0200
@@ -615,7 +615,7 @@
 &nbsp; &nbsp;&nbsp; &nbsp;3 x Letter&nbsp;&nbsp; 1386<br>
 &nbsp; &nbsp; &nbsp; 4 x Letter&nbsp;&nbsp; 1848<br>
 <br>
-&nbsp; Scanner (printtarg with -iSS -s options):<br>
+&nbsp; Acquisition device (printtarg with -iSS -s options):<br>
 <br>
 &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; 1 x A4R &nbsp; &nbsp;&nbsp; 1014<br>
 &nbsp; &nbsp; &nbsp; &nbsp;2 x A4R &nbsp; &nbsp;&nbsp; 2028<br>
diff -uNr Argyll_V1.0.1.orig/doc/ti3_format.html Argyll_V1.0.1/doc/ti3_format.html
--- Argyll_V1.0.1.orig/doc/ti3_format.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ti3_format.html	2008-07-27 11:42:04.000000000 +0200
@@ -173,7 +173,7 @@
 or "<span style="font-weight: bold;">RGB_LAB</span>" for an RGB printer
 or display, "<span style="font-weight: bold;">CMYK_XYZ</span>" for a
 printer, "<span style="font-weight: bold;">XYZ_RGB"</span> for an RGB
-scanner.<br>
+acquisition device.<br>
 <br>
 If spectral values are going to be included in the file, the following
 keywords and values shall be used:<br>
diff -uNr Argyll_V1.0.1.orig/doc/ucmm.html Argyll_V1.0.1/doc/ucmm.html
--- Argyll_V1.0.1.orig/doc/ucmm.html	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/doc/ucmm.html	2008-07-27 11:41:27.000000000 +0200
@@ -13,7 +13,7 @@
 designed just to handle the necessary configuration needed to track the
 installation and association of ICC profiles with Unix/Linux X11
 displays. It could be expanded at some point to also hold the
-associations for other devices such as scanner and printers.<br>
+associations for other devices such as acquisition devices and printers.<br>
 <br>
 It consists primarily of a small configuration database that associates
 a display monitor (identified by its EDID or the X11 display name if an
diff -uNr Argyll_V1.0.1.orig/log.txt Argyll_V1.0.1/log.txt
--- Argyll_V1.0.1.orig/log.txt	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/log.txt	2008-07-27 11:35:38.000000000 +0200
@@ -1648,7 +1648,7 @@
 	
 *   Added shaper/matrix input profile support.
 	(profile/profin.c, xicc/xmatrix.c)
-    This may be more accurate for scanner profiles,
+    This may be more accurate for device profiles,
     given the poor coverage of test points provided
     by an IT8 chart (but doesn't appear to be in practice).
 
@@ -1659,7 +1659,7 @@
 
 *   Added support in scanin.c and scanrd.c for
     using a scan of a print test chart, plus a
-    profile for the scanner, to be able to measure
+    profile for the device, to be able to measure
     color for printer calibration. This
 	new mode handles multi-page test charts.
 
@@ -1689,13 +1689,13 @@
 	patch spacer contrast determination.
 	Also added an XYZ to sRGB conversion
 	function to support RGB previews of N color
-	devices, as well as scanner recognition template files.
+	devices, as well as device recognition template files.
 
 *	Expanded xicc/xcolorants.c to incorporate
 	an approximate device model for arbitrary
 	colorant combinations. This is used to
 	be able to approximate expected density readings,
-	as well as preview colors and scanner recognition templates.
+	as well as preview colors and device recognition templates.
 
 *   Create a new test point creation module,
     target/simplat.c, to create higher dimentional,
@@ -1793,7 +1793,7 @@
 
 *   Added preliminary support in printtarg for the SpectroScan
     spectrodensitometer. Also added preliminary support for
-    scanner recognisable test charts.
+    device recognisable test charts.
 
 *   Added option to icclink to turn off the use of linearisation
     curves in the output link, since this sometimes seems to
@@ -1960,7 +1960,7 @@
   Cleaned up build automation somewhat.
 
   Added RGB output device profile generation support.
-  Added RGB scanner device profile generation support.
+  Added RGB device profile generation support.
 
   Added a couple of spectrometer conversion utilities for
   raw data files from other CMSs.
diff -uNr Argyll_V1.0.1.orig/profile/profcheck.c Argyll_V1.0.1/profile/profcheck.c
--- Argyll_V1.0.1.orig/profile/profcheck.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/profile/profcheck.c	2008-07-27 11:54:01.000000000 +0200
@@ -360,7 +360,7 @@
 			devchan = 3;
 			isLab = 1;
 			isAdditive = 1;
-		/* Scanner .ti3 files: */
+		/* Acquisition Device .ti3 files: */
 		} else if (strcmp(icg->t[0].kdata[ti],"XYZ_RGB") == 0) {
 			devspace = icSigRgbData;
 			devchan = 3;
diff -uNr Argyll_V1.0.1.orig/profile/profin.c Argyll_V1.0.1/profile/profin.c
--- Argyll_V1.0.1.orig/profile/profin.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/profile/profin.c	2008-07-27 11:53:08.000000000 +0200
@@ -49,7 +49,7 @@
 /*
    Basic algorithm outline:
 
- Scanner:
+ Acquisition Device:
 
    Figure out the input curves to give
    the flattest grid.
diff -uNr Argyll_V1.0.1.orig/scanin/scanin.c Argyll_V1.0.1/scanin/scanin.c
--- Argyll_V1.0.1.orig/scanin/scanin.c	2008-07-27 11:18:53.000000000 +0200
+++ Argyll_V1.0.1/scanin/scanin.c	2008-07-27 11:26:37.000000000 +0200
@@ -2,7 +2,7 @@
 /* 
  * Argyll Color Correction System
  *
- * Scanin: Input the scan of a test chart, and output cgats data
+ * Scanin: Input the image of a test chart, and output cgats data
  *         Uses scanrd to do the hard work.
  *
  * Author: Graeme W. Gill
@@ -72,7 +72,7 @@
 	fprintf(stderr,"Author: Graeme W. Gill, licensed under the GPL Version 3\n");
 	fprintf(stderr,"\n");
 	fprintf(stderr,"usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]\n");
-	fprintf(stderr,"   :- inputs 'input.tif' and outputs scanner 'input.ti3', or\n");
+	fprintf(stderr,"   :- inputs 'input.tif' and outputs device 'input.ti3', or\n");
 	fprintf(stderr,"\n");
 	fprintf(stderr,"usage: scanin -g [options] input.tif recogout.cht [diag.tif]\n");
 	fprintf(stderr,"   :- outputs file 'recogout.cht', or\n");
@@ -92,7 +92,7 @@
 	fprintf(stderr," -ca                  Same as -c, but accumulates more values to .ti3\n");
 	fprintf(stderr,"                       from subsequent pages\n");
 	fprintf(stderr," -r                   Replace device values in .ti2/.ti3\n");
-	fprintf(stderr,"                      Default is to create a scanner .ti3 file\n");
+	fprintf(stderr,"                      Default is to create a device .ti3 file\n");
 	fprintf(stderr," -F x1,y1,x2,y2,x3,y3,x4,y4\n");
 	fprintf(stderr,"                      Don't auto recognize, locate using four fiducual marks\n");
 	fprintf(stderr," -p                   Compensate for perspective distortion\n");
@@ -127,12 +127,12 @@
 	static char datin_name[200] = { 0 };	/* Data input name (.cie/.q60) */
 	static char datout_name[200] = { 0 };	/* Data output name (.ti3/.val) */
 	static char recog_name[200] = { 0 };	/* Reference chart name (.cht) */
-	static char prof_name[200] = { 0 };		/* scanner profile name (.cht) */
+	static char prof_name[200] = { 0 };		/* device profile name (.cht) */
 	static char diag_name[200] = { 0 };		/* Diagnostic Output (.tif) name, if used */
 	int verb = 1;
 	int tmean = 0;		/* Return true mean, rather than robust mean */
 	int repl = 0;		/* Replace .ti3 device values from raster file */
-	int outo = 0;		/* Output the values read, rather than creating scanner .ti3 */
+	int outo = 0;		/* Output the values read, rather than creating device .ti3 */
 	int colm = 0;		/* Use inage values to measure color for print profile. > 1 == append */
 	int flags = SI_GENERAL_ROT;	/* Default allow all rotations */
 
@@ -153,7 +153,7 @@
 	scanrd *sr;				/* Scanrd object */
 	int err;	
 	char *errm;
-	int pnotscan = 0;		/* Number of patches that wern't scanned */
+	int pnotscan = 0;		/* Number of patches that weren't processed */
 
 	if (argc <= 1)
 		usage();
diff -uNr Argyll_V1.0.1.orig/target/printtarg.c Argyll_V1.0.1/target/printtarg.c
--- Argyll_V1.0.1.orig/target/printtarg.c	2008-07-27 11:18:52.000000000 +0200
+++ Argyll_V1.0.1/target/printtarg.c	2008-07-27 11:37:20.000000000 +0200
@@ -3252,7 +3252,7 @@
 }
 
 /******************************************************************/
-/* Edge tracking support, for generating the scanner image        */
+/* Edge tracking support, for generating the device image        */
 /* recognition reference chart file. */
 
 /* Establish width and height to convert between topleft and */
diff -uNr Argyll_V1.0.1.orig/ttbd.txt Argyll_V1.0.1/ttbd.txt
--- Argyll_V1.0.1.orig/ttbd.txt	2008-07-27 11:18:54.000000000 +0200
+++ Argyll_V1.0.1/ttbd.txt	2008-07-27 11:54:46.000000000 +0200
@@ -123,7 +123,7 @@
 
 * Should create a .ti2 template file for some standard charts,
   such as an IT8.7/3, ECI2002 random and non-random etc.
-  Scanner recognition files too ??
+  Device recognition files too ??
 
 * Add an option to targen, that allows generation of
   test points down the neutral axis (how does this work
@@ -293,7 +293,7 @@
   patch variance is too high (probable faulty read).
 
 * Add spectral fix options to scanin code to allow compensation
-  for scanner and media errors when using a scanned image to
+  for device and media errors when using an acquired image to
   measure color.
   This means figuring out how it will work, as well as creating
   to tools to create the spectral fix data (or just add general