8 files changed, 16 insertions, 59 deletions
diff --git a/doc/el_substitute.html b/doc/el_substitute.html
index 6b72321..84b1985 100644
--- a/doc/el_substitute.html
+++ b/doc/el_substitute.html
@@ -36,7 +36,6 @@ via <em>substitution commands</em>, namely:
 </p>
 <ul>
  <li> <a href="define.html">define</a> </li>
- <li> <a href="import.html">import</a> </li>
  <li> <a href="importas.html">importas</a> </li>
  <li> <a href="elglob.html">elglob</a> </li>
  <li> <a href="elgetpositionals.html">elgetpositionals</a> </li>
diff --git a/doc/fdswap.html b/doc/fdswap.html
index cc055de..28e62bb 100644
--- a/doc/fdswap.html
+++ b/doc/fdswap.html
@@ -30,7 +30,7 @@ executes a program.
 </pre>
 
 <p>
-<tt>fdswaps</tt> swaps file descriptors numbered <em>fd1</em> and
+<tt>fdswap</tt> swaps file descriptors numbered <em>fd1</em> and
 <em>fd2</em>, then execs into <em>prog</em> with its arguments.
 </p>
 
diff --git a/doc/forbacktickx.html b/doc/forbacktickx.html
index e116be6..9cbcd98 100644
--- a/doc/forbacktickx.html
+++ b/doc/forbacktickx.html
@@ -76,7 +76,7 @@ split <em>x</em>. </li>
 <h2> Notes </h2>
 
 <ul>
- <li> You can start <em>loop...</em> with "import -u <em>variable</em>"
+ <li> You can start <em>loop...</em> with "importas -u <em>variable</em> <em>variable</em>"
 to perform variable substitution. </li>
  <li> forbacktickx is now implemented as a wrapper around the
 <a href="pipeline.html">pipeline</a> and
diff --git a/doc/import.html b/doc/import.html
deleted file mode 100644
index 8efcdd1..0000000
--- a/doc/import.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-  <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta http-equiv="Content-Language" content="en" />
-    <title>execline: the import program</title>
-    <meta name="Description" content="execline: the import program" />
-    <meta name="Keywords" content="execline command import environment variable" />
-    <!-- <link rel="stylesheet" type="text/css" href="//skarnet.org/default.css" /> -->
-  </head>
-<body>
-
-<p>
-<a href="index.html">execline</a><br />
-<a href="//skarnet.org/software/">Software</a><br />
-<a href="//skarnet.org/">skarnet.org</a>
-</p>
-
-<h1> The <tt>import</tt> program </h1>
-
-<p>
-<tt>import</tt> replaces an environment variable name with its value,
-then executes another program.
-</p>
-
-<h2> Interface </h2>
-
-<pre>
-     import [ -i | -D <em>default</em> ] [ -u ] [ -s ] [ -C | -c ] [ -n ] [ -d <em>delim</em> ] <em>envvar</em> <em>prog...</em>
-</pre>
-
-<ul>
- <li> <tt>import</tt> behaves exactly as
-<tt><a href="importas.html">importas</a> <em>envvar</em> <em>envvar</em></t>.
-</ul>
-
-<h2> Notes </h2>
-
-<ul>
- <li> Starting in execline-2.5.0.0, the <tt>import</tt> command is
-marked as obsolescent; it will disappear in a future version of execline.
-It is recommended to use the <a href="importas.html">importas</a>
-command instead. </li>
-</ul>
-
-</body>
-</html>
diff --git a/doc/index.html b/doc/index.html
index aabda00..b730778 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issues.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later. </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.6.2.0 or later. It's a build-time requirement. It's also a run-time
+2.6.4.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -66,7 +66,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.3.0.4.tar.gz">2.3.0.4</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.5.0.0.tar.gz">2.5.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/execline/">execline
 git repository</a>:
@@ -167,7 +167,6 @@ to your installation: the shebang lines for your system might be something like
 <ul>
 <li><a href="define.html">The <tt>define</tt> program</a></li>
 <li><a href="importas.html">The <tt>importas</tt> program</a></li>
-<li><a href="import.html">The <tt>import</tt> program</a></li>
 <li><a href="elglob.html">The <tt>elglob</tt> program</a></li>
 <li><a href="elgetpositionals.html">The <tt>elgetpositionals</tt> program</a></li>
 <li><a href="multidefine.html">The <tt>multidefine</tt> program</a></li>
diff --git a/doc/multisubstitute.html b/doc/multisubstitute.html
index ecfff9b..99994df 100644
--- a/doc/multisubstitute.html
+++ b/doc/multisubstitute.html
@@ -34,7 +34,6 @@ its <em>argv</em>, then executes another program.
      {
        [ <a href="define.html">define</a> [ -n ] [ -s ] [ -C | -c ] [ -d <em>delim</em> ] <em>variable</em> <em>value</em> ]
        [ <a href="importas.html">importas</a> [ -i | -D <em>default</em> ] [ -n ] [ -s ] [ -C | -c ] [ -d <em>delim</em> ] <em>variable</em> <em>envvar</em> ]
-       [ <a href="import.html">import</a> [ -i | -D <em>default</em> ] [ -n ] [ -s ] [ -C | -c ] [ -d <em>delim</em> ] <em>envvar</em> ]
        [ <a href="elglob.html">elglob</a> [ -v ] [ -w ] [ -s ] [ -m ] [ -e ] [ -0 ] <em>variable</em> <em>pattern</em> ]
        [ <a href="elgetpositionals.html">elgetpositionals</a> [ -P <em>sharp</em> ] ]
        [ <a href="multidefine.html">multidefine</a> <em>value</em> { <em>variable...</em> } ]
@@ -55,7 +54,7 @@ to learn about the syntax of each substitution command. </li>
 <h2> Options </h2>
 
 <ul>
- <li> If an <tt>import</tt> or <tt>importas</tt> directive was given with the
+ <li> If an <tt>importas</tt> directive was given with the
 <tt>-i</tt> option, and the looked up variable is undefined,
 <tt>multisubstitute</tt> will exit 100. </li>
 </ul>
@@ -73,7 +72,7 @@ to learn about the syntax of each substitution command. </li>
  #!/command/execlineb
  export A wrong
  define B ${A}
- import A
+ importas A A
  echo ${B}
 </pre>
 
@@ -88,7 +87,7 @@ to learn about the syntax of each substitution command. </li>
  multisubstitute
  {
    define B ${A}
-   import A
+   importas A A
  }
  echo ${B}
 </pre>
diff --git a/doc/quine-prj-3.txt b/doc/quine-prj-3.txt
index e5b5708..799810e 100644
--- a/doc/quine-prj-3.txt
+++ b/doc/quine-prj-3.txt
@@ -4,10 +4,10 @@ define e ${q}${E}${q}
 export E $e
 define q ${b}${q}
 define b ${b}${b}
-import E
+importas E E
 echo $e"
 export E $e
 define q \"
 define b \\
-import E
+importas E E
 echo $e
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 0c90b8a..861d7e8 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
 
 <h1> What has changed in execline </h1>
 
+<h2> in 2.5.0.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.6.4.0 </li>
+ <li> The <tt>import</tt> command has been removed. </li>
+</ul>
+
 <h2> in 2.3.0.4 </h2>
 
 <ul>