Fix typos in error messages and docs

Replace all references of `environmental variable' with `environment
variable'

ChangeLog

@@ -159,9 +159,9 @@
 	* Use Coordinated Universal Time when logging.
 	* Fix a bug in the way snf-image-update-helper reads the links of the
 	  kernel and the initrd in the helper VM.
-	* Use environmental variables instead of input options to pass
-	  sensitive data to pithcat. This is needed because when pithcat is
-	  running, every user can see the program's command line by using ps.
+	* Use environment variables instead of input options to pass sensitive
+	  data to pithcat. This is needed because when pithcat is running,
+	  every user can see the program's command line by using ps.
 
 2012-09-15, v0.6
 	* Fix import and export scripts

docs/architecture.rst

@@ -131,20 +131,20 @@ below for a description of each one of them:
 
 **FixPartitionTable**: Enlarges the last partition in the partition table of
 the instance, to consume all the available space and optionally adds a swap
-partition in the end. The task will fail if the environmental variable
+partition in the end. The task will fail if the environment variable
 *SNF_IMAGE_DEV*, which specifies the device file of the instance's hard disk,
 is missing.
 
 **FilesystemResizeUnmounted**: Extends the file system of the last partition to
 cover up the whole partition. This only works for ext{2,3,4}, FFS and UFS2 file
 systems. Any other file system type is ignored and a warning is triggered. The
-task will fail if *SNF_IMAGE_DEV* environmental variable is missing.
+task will fail if *SNF_IMAGE_DEV* environment variable is missing.
 
 **MountImage**: Mounts the root partition of the instance, specified by the
 *SNF_IMAGE_PROPERTY_ROOT_PARTITION* variable. On Linux systems after the root
 fs is mounted, the instance's ``/etc/fstab`` file is examined and the rest of
 the disk file systems are mounted too, in a correct order. The script will fail
-if any of the environmental variables *SNF_IMAGE_DEV*,
+if any of the environment variables *SNF_IMAGE_DEV*,
 *SNF_IMAGE_PROPERTY_ROOT_PARTITION* or *SNF_IMAGE_TARGET* is unset or has a
 non-sane value.
 
@@ -171,7 +171,7 @@ is needed by Windows in order to perform an unattended setup. The
 
 **SELinuxAutorelabel**: Creates *.autorelabel* file in Red Hat images. This is
 needed if SELinux is enabled to enforce an automatic file system relabeling
-during the first boot. The only environmental variable required by this task is
+during the first boot. The only environment variable required by this task is
 *SNF_IMAGE_TARGET*.
 
 **AssignHostname**: Assigns or changes the hostname of the instance. The task
@@ -204,7 +204,7 @@ missing a warning is produced. Only *SNF_IMAGE_TARGET* is required for this
 task to run.
 
 **UmountImage**: Umounts the file systems previously mounted by MountImage. The
-only environmental variable required is *SNF_IMAGE_TARGET*.
+only environment variable required is *SNF_IMAGE_TARGET*.
 
 
 +-------------------------------+---+--------------------------------------------+--------------------------------------------------+
@@ -245,4 +245,4 @@ only environmental variable required is *SNF_IMAGE_TARGET*.
 |UmountImage                    |80 |MountImage        |                         |TARGET                   |                        |
 +-------------------------------+---+------------------+-------------------------+-------------------------+------------------------+
 
-.. [#] all environmental variables are prefixed with *SNF_IMAGE_*
+.. [#] all environment variables are prefixed with *SNF_IMAGE_*

snf-image-host/create

@@ -107,8 +107,8 @@ case $BACKEND_TYPE in
         image_size=$($CURL -sI "$IMAGE_NAME" | grep ^Content-Length: | cut -d" " -f2)
         ;;
     pithos)
-        # For security reasons pass the database url to pithcat as an
-        # environmental variable.
+        # For security reasons pass the various options to pithcat as
+        # environment variables.
         export PITHCAT_INPUT_DB="$PITHOS_DB"
         export PITHCAT_INPUT_DATA="$PITHOS_DATA"
         export PITHCAT_BACKEND_STORAGE="$PITHOS_BACKEND_STORAGE"

snf-image-host/pithcat

@@ -153,7 +153,7 @@ def main():
         if not options.backend and 'PITHCAT_BACKEND_STORAGE' not in environ:
             stderr.write(
                 "Pithos backend storage is missing.\n"
-                "Use the PITHCAT_BACKEND_STORAGE environmental variable "
+                "Use the PITHCAT_BACKEND_STORAGE environment variable "
                 "(recommended) "
                 "or the --backend command line option to define it.\n")
             exit(1)
@@ -164,7 +164,7 @@ def main():
             if not options.data and 'PITHCAT_INPUT_DATA' not in environ:
                 stderr.write(
                     "Pithos data directory path is missing.\n"
-                    "Use the PITHCAT_INPUT_DATA environmental variable "
+                    "Use the PITHCAT_INPUT_DATA environment variable "
                     "(recommended) "
                     "or the --data command line option to define it.\n")
                 exit(1)
@@ -175,7 +175,7 @@ def main():
         if not options.data and 'PITHCAT_INPUT_DATA' not in environ:
             stderr.write(
                 "Pithos data directory path is missing.\n"
-                "Use the PITHCAT_INPUT_DATA environmental variable "
+                "Use the PITHCAT_INPUT_DATA environment variable "
                 "(recommended) "
                 "or the --data command line option to define it.\n")
             exit(1)
@@ -187,7 +187,7 @@ def main():
             type(url) is LocationURL:
         stderr.write(
             "Pithos database URI is missing.\n"
-            "Use the PITHCAT_INPUT_DB environmental variable (recommended) "
+            "Use the PITHCAT_INPUT_DB environment variable (recommended) "
             "or the --db command line option to define it.\n")
         exit(1)
 
@@ -210,8 +210,8 @@ def main():
             stderr.write(
                 "RADOS storage backend is selected but "
                 "RADOS conf file is missing.\n"
-                "Use the PITHCAT_RADOS_CEPH_CONF environmental variable "
-                "or the --rados-conf command line option to define it.\n")
+                "Use the PITHCAT_RADOS_CEPH_CONF environment variable or the "
+                "--rados-conf command line option to define it.\n")
             exit(1)
 
         if backend_storage == 'rados':
@@ -223,8 +223,8 @@ def main():
                 stderr.write(
                     "RADOS storage backend is selected but "
                     "RADOS pool for Pithos maps is missing.\n"
-                    "Use the PITHCAT_RADOS_POOL_MAPS environmental variable "
-                    "or the --rados-maps command line option to define it.\n")
+                    "Use the PITHCAT_RADOS_POOL_MAPS environment variable or "
+                    "the --rados-maps command line option to define it.\n")
                 exit(1)
 
             rados_maps = environ['PITHCAT_RADOS_POOL_MAPS'] if not \
@@ -235,7 +235,7 @@ def main():
                 stderr.write(
                     "RADOS storage backend is selected but "
                     "RADOS pool for Pithos blocks is missing.\n"
-                    "Use the PITHCAT_RADOS_POOL_BLOCKS environmental variable "
+                    "Use the PITHCAT_RADOS_POOL_BLOCKS environment variable "
                     "or the --rados-blocks command line option to define it.\n"
                 )
                 exit(1)