diff --git a/doc/_kx/code.kx.dump b/doc/_kx/code.kx.dump
new file mode 100644
index 0000000..2a132d3
Binary files /dev/null and b/doc/_kx/code.kx.dump differ
diff --git a/doc/_kx/mkref.py b/doc/_kx/mkref.py
index 357b3da..1cb1619 100644
--- a/doc/_kx/mkref.py
+++ b/doc/_kx/mkref.py
@@ -10,7 +10,7 @@
 
    {short}{doc}
 
-   See also `{qname} on code.kx.com <http://code.kx.com/wiki/Reference/{qname}>`_.
+   See also `{qname} on code.kx.com <{url}>`_.
 
 
 """
@@ -22,7 +22,7 @@
    {short}
 
    For details, see :func:`q.{name} <pyq.q.{name}>` and `{qname} on code.kx.com
-   <http://code.kx.com/wiki/Reference/{qname}>`_.
+   <{url}>`_.
 
 
 """
@@ -42,7 +42,7 @@
 ref_dir = script_dir / '..' / 'reference'
 q_func_rst = ref_dir / 'q-funcs.rst'
 k_meth_rst = ref_dir / 'K-meths.rst'
-code_dump = script_dir / 'code.dump'
+code_dump = script_dir / 'code.kx.dump'
 kx_docs = code_dump.load()
 
 #  Fix links
@@ -54,8 +54,8 @@
         qname = fixes.get(name, qname)
         desc = kx_docs.get(qname)
         if isinstance(desc, tuple):
-            short = desc[1]
+            _, short, url = desc
         else:
             short = 'The %s function.' % qname
-        f.write(Q_FUNC_DOC.format(name=name, short=short, qname=qname, doc=DOC[name]))
-        g.write(K_METH_DOC.format(name=name, short=short, qname=qname))
+        f.write(Q_FUNC_DOC.format(name=name, short=short, qname=qname, url=url, doc=DOC[name]))
+        g.write(K_METH_DOC.format(name=name, short=short, qname=qname, url=url))
diff --git a/doc/_kx/code.py b/doc/_kx/parse.py
similarity index 61%
rename from doc/_kx/code.py
rename to doc/_kx/parse.py
index fb438f4..b0ffbcb 100644
--- a/doc/_kx/code.py
+++ b/doc/_kx/parse.py
@@ -1,12 +1,12 @@
 # Grab function and description from code.kx.com which still uses mediawiki
 # Requires Python 3.6+
 
-from time import sleep
 from pickle import dump
+from urllib.parse import urljoin
 
 import py
 import requests
-
+from bs4 import BeautifulSoup as bs
 
 KWDS = ['abs', 'acos', 'aj', 'aj0', 'all', 'and', 'any', 'asc', 'asin', 'asof',
         'atan', 'attr', 'avg', 'avgs', 'bin', 'binr', 'ceiling', 'cols', 'cor', 'cos',
@@ -27,35 +27,34 @@
         'update', 'upper', 'upsert', 'value', 'var', 'view', 'views', 'vs', 'wavg',
         'where', 'while', 'within', 'wj', 'wj1', 'wsum', 'ww', 'xasc', 'xbar', 'xcol',
         'xcols', 'xdesc', 'xexp', 'xgroup', 'xkey', 'xlog', 'xprev', 'xrank']
-URL_PATTERN = "http://code.kx.com/wiki/Reference/{}?action=raw"
+
 HEADERS = {
     # Let's brake their statistics :)
-    'User-Agent': 'Mozilla/4.0 (compatible; MSIE 4.0; Windows NT)'
+    'User-Agent': 'Mozilla/2.0 (compatible; MSIE 3.0; Windows 3.1)'
 }
 
-OUT = {}
-
-for kwd in KWDS:
-    url = URL_PATTERN.format(kwd)
-    r = requests.get(url, headers=HEADERS)
-    if r.status_code == requests.codes.ok:
-        line = r.text.splitlines()[0]
-        try:
-            _, func, desc = line.replace('}', '').split('|')
-        except ValueError as e:
-            print(f"{kwd}: Error {e} - {line}")
-            OUT[kwd] = line
-        else:
-            OUT[kwd] = (func, desc)
-            print(f"{kwd}: {func}|{desc}")
-    else:
-        print(f"{kwd}: Error {r.status_code} downloading from {url}.")
-        OUT[kwd] = r.status_code
-
-    sleep(0.5)  # Let's not DDoS them
-
-filename = py.path.local(__file__).new(ext='dump')
-with filename.open('wb') as f:
-    dump(OUT, f)
-
-print(f"Saved into {filename}.")
+CARD = 'http://code.kx.com/q/ref/card/'
+
+out = {}
+r = requests.get(CARD, headers=HEADERS)
+if r.status_code == requests.codes.ok:
+    soup = bs(r.text, 'html.parser')
+    for div in soup.find_all('div', {'class': 'md-content'}):
+        for link in div.find_all('a'):
+            key = link.text.strip().split()[0]
+            if 'class' not in link.attrs:
+                if key in KWDS:
+                    href = urljoin(CARD, link.attrs['href'])
+                    title = link.attrs['title'].strip() if 'title' in link.attrs else key
+                    # strip unicode characters
+                    title = title.encode('ascii', 'ignore').decode().strip()
+                    out[key] = (key, title, href)
+    print("Missing:", ', '.join(k for k in KWDS if k not in out))
+    filename = py.path.local('code.kx.dump')
+    with filename.open('wb') as f:
+        dump(out, f)
+
+    print(f"Saved into {filename}.")
+
+else:
+    print(f"ERROR {r.status_code} downloading page from {CARD}.")
diff --git a/doc/conf.py b/doc/conf.py
index 4d63bbb..ac496c2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -18,7 +18,7 @@
 try:
     from pyq import __version__
 except ImportError:
-    __version__ = '4.0.1'
+    __version__ = '4.0.2'
 
 
 # If extensions (or modules to document with autodoc) are in another directory,
diff --git a/doc/install/install.rst b/doc/install/install.rst
index 8bc07fc..35edfcb 100644
--- a/doc/install/install.rst
+++ b/doc/install/install.rst
@@ -120,3 +120,5 @@ Install PyQ:
 .. include:: update.rst
 
 .. include:: centos32on64.rst
+
+.. include:: ubuntu.rst
diff --git a/doc/install/ubuntu.rst b/doc/install/ubuntu.rst
new file mode 100644
index 0000000..6c76c20
--- /dev/null
+++ b/doc/install/ubuntu.rst
@@ -0,0 +1,54 @@
+Installing PyQ on Ubuntu 16.04
+------------------------------
+
+Since Python provided by Ubuntu is statically linked, shared libraries need to be installed before PyQ can be installed.
+
+Python 2
+........
+
+Install shared libraries:
+
+.. code-block:: bash
+
+    $ sudo apt-get install libpython-dev libpython-stdlib python-pip python-virtualenv
+
+
+Create and activate virtual environment:
+
+.. code-block:: bash
+
+    $ python -m virtualenv -p $(which python2) py2
+    $ source py2/bin/activate
+
+
+Install PyQ:
+
+.. code-block:: bash
+
+    (py2) $ pip install -i https://pyq.enlnt.com --no-binary pyq pyq
+
+
+Python 3
+........
+
+Install shared libraries:
+
+.. code-block:: bash
+
+    $ sudo apt-get install libpython3-dev libpython3-stdlib python3-pip python3-virtualenv
+
+
+Create and activate virtual environment:
+
+.. code-block:: bash
+
+    $ python3 -m virtualenv -p $(which python3) py3
+    $ source py3/bin/activate
+
+
+Install PyQ:
+
+.. code-block:: bash
+
+    (py3) $ pip3 install -i https://pyq.enlnt.com --no-binary pyq pyq
+
diff --git a/doc/reference/K-meths.rst b/doc/reference/K-meths.rst
index db10e6e..c0a8064 100644
--- a/doc/reference/K-meths.rst
+++ b/doc/reference/K-meths.rst
@@ -1,321 +1,313 @@
 .. py:method:: K.abs
 
-   absolute value function
+   absolute value
 
    For details, see :func:`q.abs <pyq.q.abs>` and `abs on code.kx.com
-   <http://code.kx.com/wiki/Reference/abs>`_.
+   <http://code.kx.com/q/ref/arith-integer/#abs>`_.
 
 
 .. py:method:: K.acos
 
-   arc cosine function
+   arc cosine
 
    For details, see :func:`q.acos <pyq.q.acos>` and `acos on code.kx.com
-   <http://code.kx.com/wiki/Reference/acos>`_.
+   <http://code.kx.com/q/ref/trig/#acos>`_.
 
 
 .. py:method:: K.aj
 
-   asof join function
+   as-of join
 
    For details, see :func:`q.aj <pyq.q.aj>` and `aj on code.kx.com
-   <http://code.kx.com/wiki/Reference/aj>`_.
+   <http://code.kx.com/q/ref/joins/#aj-aj0-asof-join>`_.
 
 
 .. py:method:: K.aj0
 
-   asof join function
+   as-of join
 
    For details, see :func:`q.aj0 <pyq.q.aj0>` and `aj on code.kx.com
-   <http://code.kx.com/wiki/Reference/aj>`_.
+   <http://code.kx.com/q/ref/joins/#aj-aj0-asof-join>`_.
 
 
 .. py:method:: K.all
 
-   all function
+   all nonzero
 
    For details, see :func:`q.all <pyq.q.all>` and `all on code.kx.com
-   <http://code.kx.com/wiki/Reference/all>`_.
+   <http://code.kx.com/q/ref/logic/#all>`_.
 
 
 .. py:method:: K.and_
 
-   and verb
+   and
 
    For details, see :func:`q.and_ <pyq.q.and_>` and `and on code.kx.com
-   <http://code.kx.com/wiki/Reference/and>`_.
+   <http://code.kx.com/q/ref/logic/#and-minimum>`_.
 
 
 .. py:method:: K.any
 
-   any function
+   any item is non-zero
 
    For details, see :func:`q.any <pyq.q.any>` and `any on code.kx.com
-   <http://code.kx.com/wiki/Reference/any>`_.
+   <http://code.kx.com/q/ref/logic/#any>`_.
 
 
 .. py:method:: K.asc
 
-   ascending function
+   ascending sort
 
    For details, see :func:`q.asc <pyq.q.asc>` and `asc on code.kx.com
-   <http://code.kx.com/wiki/Reference/asc>`_.
+   <http://code.kx.com/q/ref/sort/#asc>`_.
 
 
 .. py:method:: K.asin
 
-   arc sine function
+   arc sine
 
    For details, see :func:`q.asin <pyq.q.asin>` and `asin on code.kx.com
-   <http://code.kx.com/wiki/Reference/asin>`_.
+   <http://code.kx.com/q/ref/trig/#asin>`_.
 
 
 .. py:method:: K.asof
 
-   asof verb
+   as-of operator
 
    For details, see :func:`q.asof <pyq.q.asof>` and `asof on code.kx.com
-   <http://code.kx.com/wiki/Reference/asof>`_.
+   <http://code.kx.com/q/ref/joins/#asof>`_.
 
 
 .. py:method:: K.atan
 
-   arc tangent function
+   arc tangent
 
    For details, see :func:`q.atan <pyq.q.atan>` and `atan on code.kx.com
-   <http://code.kx.com/wiki/Reference/atan>`_.
+   <http://code.kx.com/q/ref/trig/#atan>`_.
 
 
 .. py:method:: K.attr
 
-   attributes function
+   attributes
 
    For details, see :func:`q.attr <pyq.q.attr>` and `attr on code.kx.com
-   <http://code.kx.com/wiki/Reference/attr>`_.
+   <http://code.kx.com/q/ref/metadata/#attr>`_.
 
 
 .. py:method:: K.avg
 
-   average function
+   arithmetic mean
 
    For details, see :func:`q.avg <pyq.q.avg>` and `avg on code.kx.com
-   <http://code.kx.com/wiki/Reference/avg>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#avg-average>`_.
 
 
 .. py:method:: K.avgs
 
-   running averages function
+   running averages
 
    For details, see :func:`q.avgs <pyq.q.avgs>` and `avgs on code.kx.com
-   <http://code.kx.com/wiki/Reference/avgs>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#avgs-averages>`_.
 
 
 .. py:method:: K.bin
 
-   binary search verb
+   binary search
 
    For details, see :func:`q.bin <pyq.q.bin>` and `bin on code.kx.com
-   <http://code.kx.com/wiki/Reference/bin>`_.
+   <http://code.kx.com/q/ref/search/#bin-binr>`_.
 
 
 .. py:method:: K.binr
 
-   binary search verb
+   binary search
 
    For details, see :func:`q.binr <pyq.q.binr>` and `bin on code.kx.com
-   <http://code.kx.com/wiki/Reference/bin>`_.
+   <http://code.kx.com/q/ref/search/#bin-binr>`_.
 
 
 .. py:method:: K.ceiling
 
-   ceiling function
+   lowest integer above
 
    For details, see :func:`q.ceiling <pyq.q.ceiling>` and `ceiling on code.kx.com
-   <http://code.kx.com/wiki/Reference/ceiling>`_.
+   <http://code.kx.com/q/ref/arith-integer/#ceiling>`_.
 
 
 .. py:method:: K.cols
 
-   columns function
+   column names of a table
 
    For details, see :func:`q.cols <pyq.q.cols>` and `cols on code.kx.com
-   <http://code.kx.com/wiki/Reference/cols>`_.
+   <http://code.kx.com/q/ref/metadata/#cols>`_.
 
 
 .. py:method:: K.cor
 
-   correlation verb
+   correlation
 
    For details, see :func:`q.cor <pyq.q.cor>` and `cor on code.kx.com
-   <http://code.kx.com/wiki/Reference/cor>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#cor-correlation>`_.
 
 
 .. py:method:: K.cos
 
-   cosine function
+   cosine
 
    For details, see :func:`q.cos <pyq.q.cos>` and `cos on code.kx.com
-   <http://code.kx.com/wiki/Reference/cos>`_.
+   <http://code.kx.com/q/ref/trig/#cos>`_.
 
 
 .. py:method:: K.count
 
-   count function
+   number of items
 
    For details, see :func:`q.count <pyq.q.count>` and `count on code.kx.com
-   <http://code.kx.com/wiki/Reference/count>`_.
+   <http://code.kx.com/q/ref/lists/#count>`_.
 
 
 .. py:method:: K.cov
 
-   covariance verb
+   statistical covariance
 
    For details, see :func:`q.cov <pyq.q.cov>` and `cov on code.kx.com
-   <http://code.kx.com/wiki/Reference/cov>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#cov-covariance>`_.
 
 
 .. py:method:: K.cross
 
-   cross product verb
+   cross product
 
    For details, see :func:`q.cross <pyq.q.cross>` and `cross on code.kx.com
-   <http://code.kx.com/wiki/Reference/cross>`_.
+   <http://code.kx.com/q/ref/lists/#cross>`_.
 
 
 .. py:method:: K.csv
 
-   csv global
+   comma delimiter
 
    For details, see :func:`q.csv <pyq.q.csv>` and `csv on code.kx.com
-   <http://code.kx.com/wiki/Reference/csv>`_.
+   <http://code.kx.com/q/ref/filewords/#csv>`_.
 
 
 .. py:method:: K.cut
 
-   cut verb
+   cut
 
    For details, see :func:`q.cut <pyq.q.cut>` and `cut on code.kx.com
-   <http://code.kx.com/wiki/Reference/cut>`_.
+   <http://code.kx.com/q/ref/lists/#_-cut>`_.
 
 
 .. py:method:: K.deltas
 
-   deltas function
+   differences between consecutive pairs
 
    For details, see :func:`q.deltas <pyq.q.deltas>` and `deltas on code.kx.com
-   <http://code.kx.com/wiki/Reference/deltas>`_.
+   <http://code.kx.com/q/ref/arith-integer/#deltas>`_.
 
 
 .. py:method:: K.desc
 
-   descending sort function
+   descending sort
 
    For details, see :func:`q.desc <pyq.q.desc>` and `desc on code.kx.com
-   <http://code.kx.com/wiki/Reference/desc>`_.
+   <http://code.kx.com/q/ref/sort/#desc>`_.
 
 
 .. py:method:: K.dev
 
-   standard deviation function
+   standard deviation
 
    For details, see :func:`q.dev <pyq.q.dev>` and `dev on code.kx.com
-   <http://code.kx.com/wiki/Reference/dev>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#dev-standard-deviation>`_.
 
 
 .. py:method:: K.differ
 
-   differ function
+   flag differences in consecutive pairs
 
    For details, see :func:`q.differ <pyq.q.differ>` and `differ on code.kx.com
-   <http://code.kx.com/wiki/Reference/differ>`_.
+   <http://code.kx.com/q/ref/comparison/#differ>`_.
 
 
 .. py:method:: K.distinct
 
-   distinct function
+   unique items
 
    For details, see :func:`q.distinct <pyq.q.distinct>` and `distinct on code.kx.com
-   <http://code.kx.com/wiki/Reference/distinct>`_.
+   <http://code.kx.com/q/ref/search/#distinct>`_.
 
 
 .. py:method:: K.div
 
-   integer division verb
+   integer division
 
    For details, see :func:`q.div <pyq.q.div>` and `div on code.kx.com
-   <http://code.kx.com/wiki/Reference/div>`_.
+   <http://code.kx.com/q/ref/arith-integer/#div>`_.
 
 
 .. py:method:: K.dsave
 
-   dsave function
+   save global tables to disk
 
    For details, see :func:`q.dsave <pyq.q.dsave>` and `dsave on code.kx.com
-   <http://code.kx.com/wiki/Reference/dsave>`_.
-
-
-.. py:method:: K.each
-
-   each adverb
-
-   For details, see :func:`q.each <pyq.q.each>` and `each on code.kx.com
-   <http://code.kx.com/wiki/Reference/each>`_.
+   <http://code.kx.com/q/ref/filewords/#dsave>`_.
 
 
 .. py:method:: K.ej
 
-   equijoin verb
+   equi-join
 
    For details, see :func:`q.ej <pyq.q.ej>` and `ej on code.kx.com
-   <http://code.kx.com/wiki/Reference/ej>`_.
+   <http://code.kx.com/q/ref/joins/#ej-equi-join>`_.
 
 
 .. py:method:: K.ema
 
-   exponentially weighted moving average verb
+   exponentially-weighted moving average
 
    For details, see :func:`q.ema <pyq.q.ema>` and `ema on code.kx.com
-   <http://code.kx.com/wiki/Reference/ema>`_.
+   <http://code.kx.com/q/ref/stats-moving/#ema>`_.
 
 
 .. py:method:: K.ema
 
-   exponentially weighted moving average verb
+   exponentially-weighted moving average
 
    For details, see :func:`q.ema <pyq.q.ema>` and `ema on code.kx.com
-   <http://code.kx.com/wiki/Reference/ema>`_.
+   <http://code.kx.com/q/ref/stats-moving/#ema>`_.
 
 
 .. py:method:: K.enlist
 
-   enlist function
+   arguments as a list
 
    For details, see :func:`q.enlist <pyq.q.enlist>` and `enlist on code.kx.com
-   <http://code.kx.com/wiki/Reference/enlist>`_.
+   <http://code.kx.com/q/ref/lists/#enlist>`_.
 
 
 .. py:method:: K.eval
 
-   eval function
+   evaluate a parse tree
 
    For details, see :func:`q.eval <pyq.q.eval>` and `eval on code.kx.com
-   <http://code.kx.com/wiki/Reference/eval>`_.
+   <http://code.kx.com/q/ref/parsetrees/#eval>`_.
 
 
 .. py:method:: K.except_
 
-   except verb
+   left argument without items in right argument
 
    For details, see :func:`q.except_ <pyq.q.except_>` and `except on code.kx.com
-   <http://code.kx.com/wiki/Reference/except>`_.
+   <http://code.kx.com/q/ref/select/#except>`_.
 
 
 .. py:method:: K.exp
 
-   exp function
+   power of e
 
    For details, see :func:`q.exp <pyq.q.exp>` and `exp on code.kx.com
-   <http://code.kx.com/wiki/Reference/exp>`_.
+   <http://code.kx.com/q/ref/arith-float/#exp>`_.
 
 
 .. py:method:: K.fby
@@ -323,143 +315,143 @@
    filter-by
 
    For details, see :func:`q.fby <pyq.q.fby>` and `fby on code.kx.com
-   <http://code.kx.com/wiki/Reference/fby>`_.
+   <http://code.kx.com/q/ref/qsql/#fby>`_.
 
 
 .. py:method:: K.fills
 
-   fills function
+   forward-fill nulls
 
    For details, see :func:`q.fills <pyq.q.fills>` and `fills on code.kx.com
-   <http://code.kx.com/wiki/Reference/fills>`_.
+   <http://code.kx.com/q/ref/lists/#fills>`_.
 
 
 .. py:method:: K.first
 
-   first function
+   first item
 
    For details, see :func:`q.first <pyq.q.first>` and `first on code.kx.com
-   <http://code.kx.com/wiki/Reference/first>`_.
+   <http://code.kx.com/q/ref/select/#first>`_.
 
 
 .. py:method:: K.fkeys
 
-   fkeys function
+   foreign-key columns mapped to their tables
 
    For details, see :func:`q.fkeys <pyq.q.fkeys>` and `fkeys on code.kx.com
-   <http://code.kx.com/wiki/Reference/fkeys>`_.
+   <http://code.kx.com/q/ref/metadata/#fkeys>`_.
 
 
 .. py:method:: K.flip
 
-   flip function
+   transpose
 
    For details, see :func:`q.flip <pyq.q.flip>` and `flip on code.kx.com
-   <http://code.kx.com/wiki/Reference/flip>`_.
+   <http://code.kx.com/q/ref/lists/#flip>`_.
 
 
 .. py:method:: K.floor
 
-   floor function
+   greatest integer less than argument
 
    For details, see :func:`q.floor <pyq.q.floor>` and `floor on code.kx.com
-   <http://code.kx.com/wiki/Reference/floor>`_.
+   <http://code.kx.com/q/ref/arith-integer/#floor>`_.
 
 
 .. py:method:: K.get
 
-   get function
+   get
 
    For details, see :func:`q.get <pyq.q.get>` and `get on code.kx.com
-   <http://code.kx.com/wiki/Reference/get>`_.
+   <http://code.kx.com/q/ref/dotz/#zpg-get>`_.
 
 
 .. py:method:: K.getenv
 
-   getenv function
+   value of an environment variable
 
    For details, see :func:`q.getenv <pyq.q.getenv>` and `getenv on code.kx.com
-   <http://code.kx.com/wiki/Reference/getenv>`_.
+   <http://code.kx.com/q/ref/os/#getenv>`_.
 
 
 .. py:method:: K.group
 
-   group function
+   dictionary of distinct items
 
    For details, see :func:`q.group <pyq.q.group>` and `group on code.kx.com
-   <http://code.kx.com/wiki/Reference/group>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#group>`_.
 
 
 .. py:method:: K.gtime
 
-   gtime function
+   UTC timestamp
 
    For details, see :func:`q.gtime <pyq.q.gtime>` and `gtime on code.kx.com
-   <http://code.kx.com/wiki/Reference/gtime>`_.
+   <http://code.kx.com/q/ref/os/#gtime>`_.
 
 
 .. py:method:: K.hclose
 
-   hclose function
+   close a file or process
 
    For details, see :func:`q.hclose <pyq.q.hclose>` and `hclose on code.kx.com
-   <http://code.kx.com/wiki/Reference/hclose>`_.
+   <http://code.kx.com/q/ref/filewords/#hclose>`_.
 
 
 .. py:method:: K.hcount
 
-   hcount function
+   size of a file
 
    For details, see :func:`q.hcount <pyq.q.hcount>` and `hcount on code.kx.com
-   <http://code.kx.com/wiki/Reference/hcount>`_.
+   <http://code.kx.com/q/ref/filewords/#hcount>`_.
 
 
 .. py:method:: K.hdel
 
-   hdel function
+   delete a file
 
    For details, see :func:`q.hdel <pyq.q.hdel>` and `hdel on code.kx.com
-   <http://code.kx.com/wiki/Reference/hdel>`_.
+   <http://code.kx.com/q/ref/filewords/#hdel>`_.
 
 
 .. py:method:: K.hopen
 
-   hopen function
+   open a file
 
    For details, see :func:`q.hopen <pyq.q.hopen>` and `hopen on code.kx.com
-   <http://code.kx.com/wiki/Reference/hopen>`_.
+   <http://code.kx.com/q/ref/filewords/#hopen>`_.
 
 
 .. py:method:: K.hsym
 
-   hsym function
+   convert symbol to filename or IP address
 
    For details, see :func:`q.hsym <pyq.q.hsym>` and `hsym on code.kx.com
-   <http://code.kx.com/wiki/Reference/hsym>`_.
+   <http://code.kx.com/q/ref/filewords/#hsym>`_.
 
 
 .. py:method:: K.iasc
 
-   ascending function
+   indices of ascending sort
 
    For details, see :func:`q.iasc <pyq.q.iasc>` and `iasc on code.kx.com
-   <http://code.kx.com/wiki/Reference/iasc>`_.
+   <http://code.kx.com/q/ref/sort/#iasc>`_.
 
 
 .. py:method:: K.idesc
 
-   descending function
+   indices of descending sort
 
    For details, see :func:`q.idesc <pyq.q.idesc>` and `idesc on code.kx.com
-   <http://code.kx.com/wiki/Reference/idesc>`_.
+   <http://code.kx.com/q/ref/sort/#idesc>`_.
 
 
 .. py:method:: K.ij
 
-   inner join verb
+   inner join
 
    For details, see :func:`q.ij <pyq.q.ij>` and `ij on code.kx.com
-   <http://code.kx.com/wiki/Reference/ij>`_.
+   <http://code.kx.com/q/ref/joins/#ij-inner-join>`_.
 
 
 .. py:method:: K.ijf
@@ -467,815 +459,799 @@
    The ijf function.
 
    For details, see :func:`q.ijf <pyq.q.ijf>` and `ijf on code.kx.com
-   <http://code.kx.com/wiki/Reference/ijf>`_.
+   <http://code.kx.com/q/ref/joins/#ij-inner-join>`_.
 
 
 .. py:method:: K.in_
 
-   membership verb
+   membership
 
    For details, see :func:`q.in_ <pyq.q.in_>` and `in on code.kx.com
-   <http://code.kx.com/wiki/Reference/in>`_.
+   <http://code.kx.com/q/ref/search/#in>`_.
 
 
 .. py:method:: K.insert
 
-   insert verb
+   append records to a table
 
    For details, see :func:`q.insert <pyq.q.insert>` and `insert on code.kx.com
-   <http://code.kx.com/wiki/Reference/insert>`_.
+   <http://code.kx.com/q/ref/qsql/#insert>`_.
 
 
 .. py:method:: K.inter
 
-   intersect verb
+   items common to both arguments
 
    For details, see :func:`q.inter <pyq.q.inter>` and `inter on code.kx.com
-   <http://code.kx.com/wiki/Reference/inter>`_.
+   <http://code.kx.com/q/ref/select/#inter>`_.
 
 
 .. py:method:: K.inv
 
-   inverse function
+   matrix inverse
 
    For details, see :func:`q.inv <pyq.q.inv>` and `inv on code.kx.com
-   <http://code.kx.com/wiki/Reference/inv>`_.
+   <http://code.kx.com/q/ref/matrixes/#inv>`_.
 
 
 .. py:method:: K.key
 
-   key function
+   key
 
    For details, see :func:`q.key <pyq.q.key>` and `key on code.kx.com
-   <http://code.kx.com/wiki/Reference/key>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#key>`_.
 
 
 .. py:method:: K.keys
 
-   keys function
+   names of a table's columns
 
    For details, see :func:`q.keys <pyq.q.keys>` and `keys on code.kx.com
-   <http://code.kx.com/wiki/Reference/keys>`_.
+   <http://code.kx.com/q/ref/metadata/#keys>`_.
 
 
 .. py:method:: K.last
 
-   last function
+   last item
 
    For details, see :func:`q.last <pyq.q.last>` and `last on code.kx.com
-   <http://code.kx.com/wiki/Reference/last>`_.
+   <http://code.kx.com/q/ref/select/#last>`_.
 
 
 .. py:method:: K.like
 
-   pattern matching verb
+   pattern matching
 
    For details, see :func:`q.like <pyq.q.like>` and `like on code.kx.com
-   <http://code.kx.com/wiki/Reference/like>`_.
+   <http://code.kx.com/q/ref/strings/#like>`_.
 
 
 .. py:method:: K.lj
 
-   left join verb
+   left join
 
    For details, see :func:`q.lj <pyq.q.lj>` and `lj on code.kx.com
-   <http://code.kx.com/wiki/Reference/lj>`_.
+   <http://code.kx.com/q/ref/joins/#lj-ljf-left-join>`_.
 
 
 .. py:method:: K.ljf
 
-   The ljf function.
+   left join
 
    For details, see :func:`q.ljf <pyq.q.ljf>` and `ljf on code.kx.com
-   <http://code.kx.com/wiki/Reference/ljf>`_.
+   <http://code.kx.com/q/ref/joins/#lj-ljf-left-join>`_.
 
 
 .. py:method:: K.load
 
-   load function
+   load binary data
 
    For details, see :func:`q.load <pyq.q.load>` and `load on code.kx.com
-   <http://code.kx.com/wiki/Reference/load>`_.
+   <http://code.kx.com/q/ref/filewords/#load>`_.
 
 
 .. py:method:: K.log
 
-   log function
+   natural logarithm
 
    For details, see :func:`q.log <pyq.q.log>` and `log on code.kx.com
-   <http://code.kx.com/wiki/Reference/log>`_.
+   <http://code.kx.com/q/ref/arith-float/#log>`_.
 
 
 .. py:method:: K.lower
 
-   lowercase function
+   lower case
 
    For details, see :func:`q.lower <pyq.q.lower>` and `lower on code.kx.com
-   <http://code.kx.com/wiki/Reference/lower>`_.
+   <http://code.kx.com/q/ref/strings/#lower>`_.
 
 
 .. py:method:: K.lsq
 
-   least squares verb
+   least squares  matrix divide
 
    For details, see :func:`q.lsq <pyq.q.lsq>` and `lsq on code.kx.com
-   <http://code.kx.com/wiki/Reference/lsq>`_.
+   <http://code.kx.com/q/ref/matrixes/#lsq>`_.
 
 
 .. py:method:: K.ltime
 
-   ltime function
+   local timestamp
 
    For details, see :func:`q.ltime <pyq.q.ltime>` and `ltime on code.kx.com
-   <http://code.kx.com/wiki/Reference/ltime>`_.
+   <http://code.kx.com/q/ref/os/#ltime>`_.
 
 
 .. py:method:: K.ltrim
 
-   left trim function
+   function remove leading spaces
 
    For details, see :func:`q.ltrim <pyq.q.ltrim>` and `ltrim on code.kx.com
-   <http://code.kx.com/wiki/Reference/ltrim>`_.
+   <http://code.kx.com/q/ref/strings/#ltrim>`_.
 
 
 .. py:method:: K.mavg
 
-   moving average verb
+   moving average
 
    For details, see :func:`q.mavg <pyq.q.mavg>` and `mavg on code.kx.com
-   <http://code.kx.com/wiki/Reference/mavg>`_.
+   <http://code.kx.com/q/ref/stats-moving/#mavg>`_.
 
 
 .. py:method:: K.max
 
-   maximum function
+   maximum
 
    For details, see :func:`q.max <pyq.q.max>` and `max on code.kx.com
-   <http://code.kx.com/wiki/Reference/max>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#max-maximum>`_.
 
 
 .. py:method:: K.maxs
 
-   maximums function
+   maxima of preceding items
 
    For details, see :func:`q.maxs <pyq.q.maxs>` and `maxs on code.kx.com
-   <http://code.kx.com/wiki/Reference/maxs>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#maxs-maximums>`_.
 
 
 .. py:method:: K.mcount
 
-   moving count verb
+   moving count
 
    For details, see :func:`q.mcount <pyq.q.mcount>` and `mcount on code.kx.com
-   <http://code.kx.com/wiki/Reference/mcount>`_.
+   <http://code.kx.com/q/ref/stats-moving/#mcount>`_.
 
 
 .. py:method:: K.md5
 
-   md5 function
+   MD5 hash
 
    For details, see :func:`q.md5 <pyq.q.md5>` and `md5 on code.kx.com
-   <http://code.kx.com/wiki/Reference/md5>`_.
+   <http://code.kx.com/q/ref/strings/#md5>`_.
 
 
 .. py:method:: K.mdev
 
-   moving deviation verb
+   moving deviation
 
    For details, see :func:`q.mdev <pyq.q.mdev>` and `mdev on code.kx.com
-   <http://code.kx.com/wiki/Reference/mdev>`_.
+   <http://code.kx.com/q/ref/stats-moving/#mdev>`_.
 
 
 .. py:method:: K.med
 
-   median function
+   median
 
    For details, see :func:`q.med <pyq.q.med>` and `med on code.kx.com
-   <http://code.kx.com/wiki/Reference/med>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#med-median>`_.
 
 
 .. py:method:: K.meta
 
-   meta data function
+   metadata of a table
 
    For details, see :func:`q.meta <pyq.q.meta>` and `meta on code.kx.com
-   <http://code.kx.com/wiki/Reference/meta>`_.
+   <http://code.kx.com/q/ref/metadata/#meta>`_.
 
 
 .. py:method:: K.min
 
-   minimum function
+   minimum
 
    For details, see :func:`q.min <pyq.q.min>` and `min on code.kx.com
-   <http://code.kx.com/wiki/Reference/min>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#min-minimum>`_.
 
 
 .. py:method:: K.mins
 
-   minimums function
+   minimum of preceding items
 
    For details, see :func:`q.mins <pyq.q.mins>` and `mins on code.kx.com
-   <http://code.kx.com/wiki/Reference/mins>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#mins-minimums>`_.
 
 
 .. py:method:: K.mmax
 
-   moving maximum verb
+   moving maxima
 
    For details, see :func:`q.mmax <pyq.q.mmax>` and `mmax on code.kx.com
-   <http://code.kx.com/wiki/Reference/mmax>`_.
+   <http://code.kx.com/q/ref/stats-moving/#mmax>`_.
 
 
 .. py:method:: K.mmin
 
-   moving minimum verb
+   moving minima
 
    For details, see :func:`q.mmin <pyq.q.mmin>` and `mmin on code.kx.com
-   <http://code.kx.com/wiki/Reference/mmin>`_.
+   <http://code.kx.com/q/ref/stats-moving/#mmin>`_.
 
 
 .. py:method:: K.mmu
 
-   matrix multiplication verb
+   mmu
 
    For details, see :func:`q.mmu <pyq.q.mmu>` and `mmu on code.kx.com
-   <http://code.kx.com/wiki/Reference/mmu>`_.
+   <http://code.kx.com/q/ref/matrixes/#mmu>`_.
 
 
 .. py:method:: K.mod
 
-   modulus verb
+   remainder
 
    For details, see :func:`q.mod <pyq.q.mod>` and `mod on code.kx.com
-   <http://code.kx.com/wiki/Reference/mod>`_.
+   <http://code.kx.com/q/ref/arith-integer/#mod>`_.
 
 
 .. py:method:: K.msum
 
-   moving sum verb
+   moving sum
 
    For details, see :func:`q.msum <pyq.q.msum>` and `msum on code.kx.com
-   <http://code.kx.com/wiki/Reference/msum>`_.
+   <http://code.kx.com/q/ref/stats-moving/#msum>`_.
 
 
 .. py:method:: K.neg
 
-   negative function
+   negate
 
    For details, see :func:`q.neg <pyq.q.neg>` and `neg on code.kx.com
-   <http://code.kx.com/wiki/Reference/neg>`_.
+   <http://code.kx.com/q/ref/arith-integer/#neg>`_.
 
 
 .. py:method:: K.next
 
-   next function
+   next items
 
    For details, see :func:`q.next <pyq.q.next>` and `next on code.kx.com
-   <http://code.kx.com/wiki/Reference/next>`_.
+   <http://code.kx.com/q/ref/select/#next>`_.
 
 
 .. py:method:: K.not_
 
-   logical not function
+   not
 
    For details, see :func:`q.not_ <pyq.q.not_>` and `not on code.kx.com
-   <http://code.kx.com/wiki/Reference/not>`_.
+   <http://code.kx.com/q/ref/comparison/#six-comparison-operators>`_.
 
 
 .. py:method:: K.null
 
-   null function
+   null
 
    For details, see :func:`q.null <pyq.q.null>` and `null on code.kx.com
-   <http://code.kx.com/wiki/Reference/null>`_.
+   <http://code.kx.com/q/ref/unclassified/#null>`_.
 
 
 .. py:method:: K.or_
 
-   or verb
+   or
 
    For details, see :func:`q.or_ <pyq.q.or_>` and `or on code.kx.com
-   <http://code.kx.com/wiki/Reference/or>`_.
-
-
-.. py:method:: K.over
-
-   over adverb
-
-   For details, see :func:`q.over <pyq.q.over>` and `over on code.kx.com
-   <http://code.kx.com/wiki/Reference/over>`_.
+   <http://code.kx.com/q/ref/logic/#or-maximum>`_.
 
 
 .. py:method:: K.parse
 
-   parse function
+   parse a string
 
    For details, see :func:`q.parse <pyq.q.parse>` and `parse on code.kx.com
-   <http://code.kx.com/wiki/Reference/parse>`_.
+   <http://code.kx.com/q/ref/parsetrees/#parse>`_.
 
 
 .. py:method:: K.peach
 
-   parallel each adverb
+   peach
 
    For details, see :func:`q.peach <pyq.q.peach>` and `peach on code.kx.com
-   <http://code.kx.com/wiki/Reference/peach>`_.
+   <http://code.kx.com/q/ref/dotz/#zpd-peach-handles>`_.
 
 
 .. py:method:: K.pj
 
-   plus join verb
+   plus join
 
    For details, see :func:`q.pj <pyq.q.pj>` and `pj on code.kx.com
-   <http://code.kx.com/wiki/Reference/pj>`_.
+   <http://code.kx.com/q/ref/joins/#pj-plus-join>`_.
 
 
 .. py:method:: K.prd
 
-   product function
+   product
 
    For details, see :func:`q.prd <pyq.q.prd>` and `prd on code.kx.com
-   <http://code.kx.com/wiki/Reference/prd>`_.
+   <http://code.kx.com/q/ref/arith-float/#prd>`_.
 
 
 .. py:method:: K.prds
 
-   cumulative product function
+   cumulative products
 
    For details, see :func:`q.prds <pyq.q.prds>` and `prds on code.kx.com
-   <http://code.kx.com/wiki/Reference/prds>`_.
+   <http://code.kx.com/q/ref/arith-float/#prds>`_.
 
 
 .. py:method:: K.prev
 
-   prev function
+   previous items
 
    For details, see :func:`q.prev <pyq.q.prev>` and `prev on code.kx.com
-   <http://code.kx.com/wiki/Reference/prev>`_.
+   <http://code.kx.com/q/ref/select/#prev>`_.
 
 
 .. py:method:: K.prior
 
-   prior function
+   prior
 
    For details, see :func:`q.prior <pyq.q.prior>` and `prior on code.kx.com
-   <http://code.kx.com/wiki/Reference/prior>`_.
+   <http://code.kx.com/q/ref/control/#prior>`_.
 
 
 .. py:method:: K.rand
 
-   random function
+   random number
 
    For details, see :func:`q.rand <pyq.q.rand>` and `rand on code.kx.com
-   <http://code.kx.com/wiki/Reference/rand>`_.
+   <http://code.kx.com/q/ref/random/#rand>`_.
 
 
 .. py:method:: K.rank
 
-   rank function
+   grade up
 
    For details, see :func:`q.rank <pyq.q.rank>` and `rank on code.kx.com
-   <http://code.kx.com/wiki/Reference/rank>`_.
+   <http://code.kx.com/q/ref/sort/#rank>`_.
 
 
 .. py:method:: K.ratios
 
-   ratios function
+   ratios of consecutive pairs
 
    For details, see :func:`q.ratios <pyq.q.ratios>` and `ratios on code.kx.com
-   <http://code.kx.com/wiki/Reference/ratios>`_.
+   <http://code.kx.com/q/ref/arith-float/#ratios>`_.
 
 
 .. py:method:: K.raze
 
-   raze function
+   join items
 
    For details, see :func:`q.raze <pyq.q.raze>` and `raze on code.kx.com
-   <http://code.kx.com/wiki/Reference/raze>`_.
+   <http://code.kx.com/q/ref/lists/#raze>`_.
 
 
 .. py:method:: K.read0
 
-   file read function
+   read file as lines
 
    For details, see :func:`q.read0 <pyq.q.read0>` and `read0 on code.kx.com
-   <http://code.kx.com/wiki/Reference/read0>`_.
+   <http://code.kx.com/q/ref/filewords/#read0>`_.
 
 
 .. py:method:: K.read1
 
-   file read function
+   read file as bytes
 
    For details, see :func:`q.read1 <pyq.q.read1>` and `read1 on code.kx.com
-   <http://code.kx.com/wiki/Reference/read1>`_.
+   <http://code.kx.com/q/ref/filewords/#read1>`_.
 
 
 .. py:method:: K.reciprocal
 
-   reciprocal function
+   reciprocal of a number
 
    For details, see :func:`q.reciprocal <pyq.q.reciprocal>` and `reciprocal on code.kx.com
-   <http://code.kx.com/wiki/Reference/reciprocal>`_.
-
-
-.. py:method:: K.reval
-
-   reval function
-
-   For details, see :func:`q.reval <pyq.q.reval>` and `reval on code.kx.com
-   <http://code.kx.com/wiki/Reference/reval>`_.
+   <http://code.kx.com/q/ref/arith-float/#reciprocal>`_.
 
 
 .. py:method:: K.reval
 
-   reval function
+   variation of eval
 
    For details, see :func:`q.reval <pyq.q.reval>` and `reval on code.kx.com
-   <http://code.kx.com/wiki/Reference/reval>`_.
+   <http://code.kx.com/q/ref/parsetrees/#reval>`_.
 
 
 .. py:method:: K.reverse
 
-   reverse function
+   reverse the order of items
 
    For details, see :func:`q.reverse <pyq.q.reverse>` and `reverse on code.kx.com
-   <http://code.kx.com/wiki/Reference/reverse>`_.
+   <http://code.kx.com/q/ref/lists/#reverse>`_.
 
 
 .. py:method:: K.rload
 
-   rload function
+   load a splayed table
 
    For details, see :func:`q.rload <pyq.q.rload>` and `rload on code.kx.com
-   <http://code.kx.com/wiki/Reference/rload>`_.
+   <http://code.kx.com/q/ref/filewords/#rload>`_.
 
 
 .. py:method:: K.rotate
 
-   rotate verb
+   rotate items
 
    For details, see :func:`q.rotate <pyq.q.rotate>` and `rotate on code.kx.com
-   <http://code.kx.com/wiki/Reference/rotate>`_.
+   <http://code.kx.com/q/ref/lists/#rotate>`_.
 
 
 .. py:method:: K.rsave
 
-   rsave function
+   rsave
 
    For details, see :func:`q.rsave <pyq.q.rsave>` and `rsave on code.kx.com
-   <http://code.kx.com/wiki/Reference/rsave>`_.
+   <http://code.kx.com/q/ref/filewords/#rsave>`_.
 
 
 .. py:method:: K.rtrim
 
-   right trim function
+   remove trailing spaces
 
    For details, see :func:`q.rtrim <pyq.q.rtrim>` and `rtrim on code.kx.com
-   <http://code.kx.com/wiki/Reference/rtrim>`_.
+   <http://code.kx.com/q/ref/strings/#rtrim>`_.
 
 
 .. py:method:: K.save
 
-   save function
+   save global data to file
 
    For details, see :func:`q.save <pyq.q.save>` and `save on code.kx.com
-   <http://code.kx.com/wiki/Reference/save>`_.
-
-
-.. py:method:: K.scan
-
-   scan adverb
-
-   For details, see :func:`q.scan <pyq.q.scan>` and `scan on code.kx.com
-   <http://code.kx.com/wiki/Reference/scan>`_.
+   <http://code.kx.com/q/ref/filewords/#save>`_.
 
 
 .. py:method:: K.scov
 
-   statistical covariance verb
+   statistical covariance
 
    For details, see :func:`q.scov <pyq.q.scov>` and `scov on code.kx.com
-   <http://code.kx.com/wiki/Reference/scov>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#scov-statistical-covariance>`_.
 
 
 .. py:method:: K.scov
 
-   statistical covariance verb
+   statistical covariance
 
    For details, see :func:`q.scov <pyq.q.scov>` and `scov on code.kx.com
-   <http://code.kx.com/wiki/Reference/scov>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#scov-statistical-covariance>`_.
 
 
 .. py:method:: K.sdev
 
-   statistical standard deviation function
+   statistical standard deviation
 
    For details, see :func:`q.sdev <pyq.q.sdev>` and `sdev on code.kx.com
-   <http://code.kx.com/wiki/Reference/sdev>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#sdev-statistical-standard-deviation>`_.
 
 
 .. py:method:: K.sdev
 
-   statistical standard deviation function
+   statistical standard deviation
 
    For details, see :func:`q.sdev <pyq.q.sdev>` and `sdev on code.kx.com
-   <http://code.kx.com/wiki/Reference/sdev>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#sdev-statistical-standard-deviation>`_.
 
 
 .. py:method:: K.set
 
-   set verb
+   set
 
    For details, see :func:`q.set <pyq.q.set>` and `set on code.kx.com
-   <http://code.kx.com/wiki/Reference/set>`_.
+   <http://code.kx.com/q/ref/dotz/#zps-set>`_.
 
 
 .. py:method:: K.setenv
 
-   setenv verb
+   set an environment variable
 
    For details, see :func:`q.setenv <pyq.q.setenv>` and `setenv on code.kx.com
-   <http://code.kx.com/wiki/Reference/setenv>`_.
+   <http://code.kx.com/q/ref/os/#setenv>`_.
 
 
 .. py:method:: K.show
 
-   show function
+   format to the console
 
    For details, see :func:`q.show <pyq.q.show>` and `show on code.kx.com
-   <http://code.kx.com/wiki/Reference/show>`_.
+   <http://code.kx.com/q/ref/devtools/#show>`_.
 
 
 .. py:method:: K.signum
 
-   signum function
+   sign of its argument/s
 
    For details, see :func:`q.signum <pyq.q.signum>` and `signum on code.kx.com
-   <http://code.kx.com/wiki/Reference/signum>`_.
+   <http://code.kx.com/q/ref/arith-integer/#signum>`_.
 
 
 .. py:method:: K.sin
 
-   sine function
+   sine
 
    For details, see :func:`q.sin <pyq.q.sin>` and `sin on code.kx.com
-   <http://code.kx.com/wiki/Reference/sin>`_.
+   <http://code.kx.com/q/ref/trig/#sin>`_.
 
 
 .. py:method:: K.sqrt
 
-   square root function
+   square root
 
    For details, see :func:`q.sqrt <pyq.q.sqrt>` and `sqrt on code.kx.com
-   <http://code.kx.com/wiki/Reference/sqrt>`_.
+   <http://code.kx.com/q/ref/arith-float/#sqrt>`_.
 
 
 .. py:method:: K.ss
 
-   string search function
+   string search
 
    For details, see :func:`q.ss <pyq.q.ss>` and `ss on code.kx.com
-   <http://code.kx.com/wiki/Reference/ss>`_.
+   <http://code.kx.com/q/ref/strings/#ss>`_.
 
 
 .. py:method:: K.ssr
 
-   string search replace function
+   string search and replace
 
    For details, see :func:`q.ssr <pyq.q.ssr>` and `ssr on code.kx.com
-   <http://code.kx.com/wiki/Reference/ssr>`_.
+   <http://code.kx.com/q/ref/strings/#ssr>`_.
 
 
 .. py:method:: K.string
 
-   string function
+   cast to string
 
    For details, see :func:`q.string <pyq.q.string>` and `string on code.kx.com
-   <http://code.kx.com/wiki/Reference/string>`_.
+   <http://code.kx.com/q/ref/casting/#string>`_.
 
 
 .. py:method:: K.sublist
 
-   sublist verb
+   sublist of a list
 
    For details, see :func:`q.sublist <pyq.q.sublist>` and `sublist on code.kx.com
-   <http://code.kx.com/wiki/Reference/sublist>`_.
+   <http://code.kx.com/q/ref/select/#sublist>`_.
 
 
 .. py:method:: K.sum
 
-   sum function
+   sum of a list
 
    For details, see :func:`q.sum <pyq.q.sum>` and `sum on code.kx.com
-   <http://code.kx.com/wiki/Reference/sum>`_.
+   <http://code.kx.com/q/ref/arith-integer/#sum>`_.
 
 
 .. py:method:: K.sums
 
-   cumulative sum function
+   cumulative sums of a list
 
    For details, see :func:`q.sums <pyq.q.sums>` and `sums on code.kx.com
-   <http://code.kx.com/wiki/Reference/sums>`_.
+   <http://code.kx.com/q/ref/arith-integer/#sums>`_.
 
 
 .. py:method:: K.sv
 
-   scalar from vector verb
+   consolidate
 
    For details, see :func:`q.sv <pyq.q.sv>` and `sv on code.kx.com
-   <http://code.kx.com/wiki/Reference/sv>`_.
+   <http://code.kx.com/q/ref/lists/#sv>`_.
 
 
 .. py:method:: K.svar
 
-   statistical variance function
+   statistical variance
 
    For details, see :func:`q.svar <pyq.q.svar>` and `svar on code.kx.com
-   <http://code.kx.com/wiki/Reference/svar>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#svar-statistical-variance>`_.
 
 
 .. py:method:: K.svar
 
-   statistical variance function
+   statistical variance
 
    For details, see :func:`q.svar <pyq.q.svar>` and `svar on code.kx.com
-   <http://code.kx.com/wiki/Reference/svar>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#svar-statistical-variance>`_.
 
 
 .. py:method:: K.system
 
-   system command function
+   system
 
    For details, see :func:`q.system <pyq.q.system>` and `system on code.kx.com
-   <http://code.kx.com/wiki/Reference/system>`_.
+   <http://code.kx.com/q/ref/syscmds>`_.
 
 
 .. py:method:: K.tables
 
-   tables function
+   sorted list of tables
 
    For details, see :func:`q.tables <pyq.q.tables>` and `tables on code.kx.com
-   <http://code.kx.com/wiki/Reference/tables>`_.
+   <http://code.kx.com/q/ref/metadata/#tables>`_.
 
 
 .. py:method:: K.tan
 
-   tangent function
+   tangent
 
    For details, see :func:`q.tan <pyq.q.tan>` and `tan on code.kx.com
-   <http://code.kx.com/wiki/Reference/tan>`_.
+   <http://code.kx.com/q/ref/trig/#tan>`_.
 
 
 .. py:method:: K.til
 
-   til function
+   integers up to x
 
    For details, see :func:`q.til <pyq.q.til>` and `til on code.kx.com
-   <http://code.kx.com/wiki/Reference/til>`_.
+   <http://code.kx.com/q/ref/arith-integer/#til>`_.
 
 
 .. py:method:: K.trim
 
-   trim function
+   remove leading and trailing spaces
 
    For details, see :func:`q.trim <pyq.q.trim>` and `trim on code.kx.com
-   <http://code.kx.com/wiki/Reference/trim>`_.
+   <http://code.kx.com/q/ref/strings/#trim>`_.
 
 
 .. py:method:: K.type
 
-   type function
+   data type
 
    For details, see :func:`q.type <pyq.q.type>` and `type on code.kx.com
-   <http://code.kx.com/wiki/Reference/type>`_.
+   <http://code.kx.com/q/ref/metadata/#type>`_.
 
 
 .. py:method:: K.uj
 
-   union join verb
+   union join
 
    For details, see :func:`q.uj <pyq.q.uj>` and `uj on code.kx.com
-   <http://code.kx.com/wiki/Reference/uj>`_.
+   <http://code.kx.com/q/ref/joins/#uj-union-join>`_.
+
+
+.. py:method:: K.ujf
+
+   The ujf function.
+
+   For details, see :func:`q.ujf <pyq.q.ujf>` and `ujf on code.kx.com
+   <http://code.kx.com/q/ref/joins/#uj-union-join>`_.
 
 
 .. py:method:: K.ungroup
 
-   ungroup function
+   flattened table
 
    For details, see :func:`q.ungroup <pyq.q.ungroup>` and `ungroup on code.kx.com
-   <http://code.kx.com/wiki/Reference/ungroup>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#ungroup>`_.
 
 
 .. py:method:: K.union
 
-   union verb
+   distinct items of combination of two lists
 
    For details, see :func:`q.union <pyq.q.union>` and `union on code.kx.com
-   <http://code.kx.com/wiki/Reference/union>`_.
+   <http://code.kx.com/q/ref/select/#union>`_.
 
 
 .. py:method:: K.upper
 
-   uppercase function
+   upper-case
 
    For details, see :func:`q.upper <pyq.q.upper>` and `upper on code.kx.com
-   <http://code.kx.com/wiki/Reference/upper>`_.
+   <http://code.kx.com/q/ref/strings/#upper>`_.
 
 
 .. py:method:: K.upsert
 
-   upsert verb
+   add table records
 
    For details, see :func:`q.upsert <pyq.q.upsert>` and `upsert on code.kx.com
-   <http://code.kx.com/wiki/Reference/upsert>`_.
+   <http://code.kx.com/q/ref/qsql/#upsert>`_.
 
 
 .. py:method:: K.value
 
-   value function
+   value
 
    For details, see :func:`q.value <pyq.q.value>` and `value on code.kx.com
-   <http://code.kx.com/wiki/Reference/value>`_.
+   <http://code.kx.com/q/ref/dotz/#zvs-value-set>`_.
 
 
 .. py:method:: K.var
 
-   variance function
+   variance
 
    For details, see :func:`q.var <pyq.q.var>` and `var on code.kx.com
-   <http://code.kx.com/wiki/Reference/var>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#var-variance>`_.
 
 
 .. py:method:: K.view
 
-   view function
+   definition of a dependency
 
    For details, see :func:`q.view <pyq.q.view>` and `view on code.kx.com
-   <http://code.kx.com/wiki/Reference/view>`_.
+   <http://code.kx.com/q/ref/metadata/#view>`_.
 
 
 .. py:method:: K.views
 
-   views function
+   list of defined views
 
    For details, see :func:`q.views <pyq.q.views>` and `views on code.kx.com
-   <http://code.kx.com/wiki/Reference/views>`_.
+   <http://code.kx.com/q/ref/environment/#views>`_.
 
 
 .. py:method:: K.vs
 
-   vector from scalar verb
+   split
 
    For details, see :func:`q.vs <pyq.q.vs>` and `vs on code.kx.com
-   <http://code.kx.com/wiki/Reference/vs>`_.
+   <http://code.kx.com/q/ref/lists/#vs>`_.
 
 
 .. py:method:: K.wavg
 
-   weighted average verb
+   weighted average
 
    For details, see :func:`q.wavg <pyq.q.wavg>` and `wavg on code.kx.com
-   <http://code.kx.com/wiki/Reference/wavg>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#wavg-weighted-average>`_.
 
 
 .. py:method:: K.where
 
-   where function
+   replicated items
 
    For details, see :func:`q.where <pyq.q.where>` and `where on code.kx.com
-   <http://code.kx.com/wiki/Reference/where>`_.
+   <http://code.kx.com/q/ref/select/#where>`_.
 
 
 .. py:method:: K.within
 
-   within verb
+   flag items within range
 
    For details, see :func:`q.within <pyq.q.within>` and `within on code.kx.com
-   <http://code.kx.com/wiki/Reference/within>`_.
+   <http://code.kx.com/q/ref/search/#within>`_.
 
 
 .. py:method:: K.wj
 
-   window join function
+   window join
 
    For details, see :func:`q.wj <pyq.q.wj>` and `wj on code.kx.com
-   <http://code.kx.com/wiki/Reference/wj>`_.
+   <http://code.kx.com/q/ref/joins/#wj-wj1-window-join>`_.
 
 
 .. py:method:: K.wj1
 
-   The wj1 function.
+   window join
 
    For details, see :func:`q.wj1 <pyq.q.wj1>` and `wj1 on code.kx.com
-   <http://code.kx.com/wiki/Reference/wj1>`_.
+   <http://code.kx.com/q/ref/joins/#wj-wj1-window-join>`_.
 
 
 .. py:method:: K.wsum
 
-   weighted sum verb
+   weighted sum
 
    For details, see :func:`q.wsum <pyq.q.wsum>` and `wsum on code.kx.com
-   <http://code.kx.com/wiki/Reference/wsum>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#wsum-weighted-sum>`_.
 
 
 .. py:method:: K.ww
@@ -1283,94 +1259,94 @@
    The ww function.
 
    For details, see :func:`q.ww <pyq.q.ww>` and `ww on code.kx.com
-   <http://code.kx.com/wiki/Reference/ww>`_.
+   <http://code.kx.com/q/ref/stats-aggregates/#wsum-weighted-sum>`_.
 
 
 .. py:method:: K.xasc
 
-   ascending sort verb
+   table sorted ascending by columns
 
    For details, see :func:`q.xasc <pyq.q.xasc>` and `xasc on code.kx.com
-   <http://code.kx.com/wiki/Reference/xasc>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xasc>`_.
 
 
 .. py:method:: K.xbar
 
-   interval bar verb
+   interval bar
 
    For details, see :func:`q.xbar <pyq.q.xbar>` and `xbar on code.kx.com
-   <http://code.kx.com/wiki/Reference/xbar>`_.
+   <http://code.kx.com/q/ref/arith-integer/#xbar>`_.
 
 
 .. py:method:: K.xcol
 
-   rename columns verb
+   rename table columns
 
    For details, see :func:`q.xcol <pyq.q.xcol>` and `xcol on code.kx.com
-   <http://code.kx.com/wiki/Reference/xcol>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xcol>`_.
 
 
 .. py:method:: K.xcols
 
-   reorder columns verb
+   re-order table columns
 
    For details, see :func:`q.xcols <pyq.q.xcols>` and `xcols on code.kx.com
-   <http://code.kx.com/wiki/Reference/xcols>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xcols>`_.
 
 
 .. py:method:: K.xdesc
 
-   descending sort verb
+   table sorted descending by columns
 
    For details, see :func:`q.xdesc <pyq.q.xdesc>` and `xdesc on code.kx.com
-   <http://code.kx.com/wiki/Reference/xdesc>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xdesc>`_.
 
 
 .. py:method:: K.xexp
 
-   power verb
+   raised to a power
 
    For details, see :func:`q.xexp <pyq.q.xexp>` and `xexp on code.kx.com
-   <http://code.kx.com/wiki/Reference/xexp>`_.
+   <http://code.kx.com/q/ref/arith-float/#xexp>`_.
 
 
 .. py:method:: K.xgroup
 
-   grouping verb
+   table grouped by keys
 
    For details, see :func:`q.xgroup <pyq.q.xgroup>` and `xgroup on code.kx.com
-   <http://code.kx.com/wiki/Reference/xgroup>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xgroup>`_.
 
 
 .. py:method:: K.xkey
 
-   set primary key verb
+   set primary keys of a table
 
    For details, see :func:`q.xkey <pyq.q.xkey>` and `xkey on code.kx.com
-   <http://code.kx.com/wiki/Reference/xkey>`_.
+   <http://code.kx.com/q/ref/dictsandtables/#xkey>`_.
 
 
 .. py:method:: K.xlog
 
-   base-x log verb
+   base-x logarithm
 
    For details, see :func:`q.xlog <pyq.q.xlog>` and `xlog on code.kx.com
-   <http://code.kx.com/wiki/Reference/xlog>`_.
+   <http://code.kx.com/q/ref/arith-float/#xlog>`_.
 
 
 .. py:method:: K.xprev
 
-   previous verb
+   previous items
 
    For details, see :func:`q.xprev <pyq.q.xprev>` and `xprev on code.kx.com
-   <http://code.kx.com/wiki/Reference/xprev>`_.
+   <http://code.kx.com/q/ref/select/#xprev>`_.
 
 
 .. py:method:: K.xrank
 
-   buckets verb
+   items assigned to buckets
 
    For details, see :func:`q.xrank <pyq.q.xrank>` and `xrank on code.kx.com
-   <http://code.kx.com/wiki/Reference/xrank>`_.
+   <http://code.kx.com/q/ref/sort/#xrank>`_.
 
 
diff --git a/doc/reference/q-funcs.rst b/doc/reference/q-funcs.rst
index 3321deb..7381248 100644
--- a/doc/reference/q-funcs.rst
+++ b/doc/reference/q-funcs.rst
@@ -1,6 +1,6 @@
 .. py:function:: q.abs
 
-   absolute value function
+   absolute value
    The abs function computes the absolute value of its argument. Null is returned if the argument is null.
 
    >>> q.abs([-1, 0, 1, None])
@@ -8,1201 +8,1182 @@
 
 
 
-   See also `abs on code.kx.com <http://code.kx.com/wiki/Reference/abs>`_.
+   See also `abs on code.kx.com <http://code.kx.com/q/ref/arith-integer/#abs>`_.
 
 
 .. py:function:: q.acos
 
-   arc cosine function
+   arc cosine
 
-   See also `acos on code.kx.com <http://code.kx.com/wiki/Reference/acos>`_.
+   See also `acos on code.kx.com <http://code.kx.com/q/ref/trig/#acos>`_.
 
 
 .. py:function:: q.aj
 
-   asof join function
+   as-of join
 
-   See also `aj on code.kx.com <http://code.kx.com/wiki/Reference/aj>`_.
+   See also `aj on code.kx.com <http://code.kx.com/q/ref/joins/#aj-aj0-asof-join>`_.
 
 
 .. py:function:: q.aj0
 
-   asof join function
+   as-of join
 
-   See also `aj on code.kx.com <http://code.kx.com/wiki/Reference/aj>`_.
+   See also `aj on code.kx.com <http://code.kx.com/q/ref/joins/#aj-aj0-asof-join>`_.
 
 
 .. py:function:: q.all
 
-   all function
+   all nonzero
 
-   See also `all on code.kx.com <http://code.kx.com/wiki/Reference/all>`_.
+   See also `all on code.kx.com <http://code.kx.com/q/ref/logic/#all>`_.
 
 
 .. py:function:: q.and_
 
-   and verb
+   and
 
-   See also `and on code.kx.com <http://code.kx.com/wiki/Reference/and>`_.
+   See also `and on code.kx.com <http://code.kx.com/q/ref/logic/#and-minimum>`_.
 
 
 .. py:function:: q.any
 
-   any function
+   any item is non-zero
 
-   See also `any on code.kx.com <http://code.kx.com/wiki/Reference/any>`_.
+   See also `any on code.kx.com <http://code.kx.com/q/ref/logic/#any>`_.
 
 
 .. py:function:: q.asc
 
-   ascending function
+   ascending sort
 
-   See also `asc on code.kx.com <http://code.kx.com/wiki/Reference/asc>`_.
+   See also `asc on code.kx.com <http://code.kx.com/q/ref/sort/#asc>`_.
 
 
 .. py:function:: q.asin
 
-   arc sine function
+   arc sine
 
-   See also `asin on code.kx.com <http://code.kx.com/wiki/Reference/asin>`_.
+   See also `asin on code.kx.com <http://code.kx.com/q/ref/trig/#asin>`_.
 
 
 .. py:function:: q.asof
 
-   asof verb
+   as-of operator
 
-   See also `asof on code.kx.com <http://code.kx.com/wiki/Reference/asof>`_.
+   See also `asof on code.kx.com <http://code.kx.com/q/ref/joins/#asof>`_.
 
 
 .. py:function:: q.atan
 
-   arc tangent function
+   arc tangent
 
-   See also `atan on code.kx.com <http://code.kx.com/wiki/Reference/atan>`_.
+   See also `atan on code.kx.com <http://code.kx.com/q/ref/trig/#atan>`_.
 
 
 .. py:function:: q.attr
 
-   attributes function
+   attributes
 
-   See also `attr on code.kx.com <http://code.kx.com/wiki/Reference/attr>`_.
+   See also `attr on code.kx.com <http://code.kx.com/q/ref/metadata/#attr>`_.
 
 
 .. py:function:: q.avg
 
-   average function
+   arithmetic mean
 
-   See also `avg on code.kx.com <http://code.kx.com/wiki/Reference/avg>`_.
+   See also `avg on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#avg-average>`_.
 
 
 .. py:function:: q.avgs
 
-   running averages function
+   running averages
 
-   See also `avgs on code.kx.com <http://code.kx.com/wiki/Reference/avgs>`_.
+   See also `avgs on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#avgs-averages>`_.
 
 
 .. py:function:: q.bin
 
-   binary search verb
+   binary search
 
-   See also `bin on code.kx.com <http://code.kx.com/wiki/Reference/bin>`_.
+   See also `bin on code.kx.com <http://code.kx.com/q/ref/search/#bin-binr>`_.
 
 
 .. py:function:: q.binr
 
-   binary search verb
+   binary search
 
-   See also `bin on code.kx.com <http://code.kx.com/wiki/Reference/bin>`_.
+   See also `bin on code.kx.com <http://code.kx.com/q/ref/search/#bin-binr>`_.
 
 
 .. py:function:: q.ceiling
 
-   ceiling function
+   lowest integer above
 
-   See also `ceiling on code.kx.com <http://code.kx.com/wiki/Reference/ceiling>`_.
+   See also `ceiling on code.kx.com <http://code.kx.com/q/ref/arith-integer/#ceiling>`_.
 
 
 .. py:function:: q.cols
 
-   columns function
+   column names of a table
 
-   See also `cols on code.kx.com <http://code.kx.com/wiki/Reference/cols>`_.
+   See also `cols on code.kx.com <http://code.kx.com/q/ref/metadata/#cols>`_.
 
 
 .. py:function:: q.cor
 
-   correlation verb
+   correlation
 
-   See also `cor on code.kx.com <http://code.kx.com/wiki/Reference/cor>`_.
+   See also `cor on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#cor-correlation>`_.
 
 
 .. py:function:: q.cos
 
-   cosine function
+   cosine
 
-   See also `cos on code.kx.com <http://code.kx.com/wiki/Reference/cos>`_.
+   See also `cos on code.kx.com <http://code.kx.com/q/ref/trig/#cos>`_.
 
 
 .. py:function:: q.count
 
-   count function
+   number of items
 
-   See also `count on code.kx.com <http://code.kx.com/wiki/Reference/count>`_.
+   See also `count on code.kx.com <http://code.kx.com/q/ref/lists/#count>`_.
 
 
 .. py:function:: q.cov
 
-   covariance verb
+   statistical covariance
 
-   See also `cov on code.kx.com <http://code.kx.com/wiki/Reference/cov>`_.
+   See also `cov on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#cov-covariance>`_.
 
 
 .. py:function:: q.cross
 
-   cross product verb
+   cross product
 
-   See also `cross on code.kx.com <http://code.kx.com/wiki/Reference/cross>`_.
+   See also `cross on code.kx.com <http://code.kx.com/q/ref/lists/#cross>`_.
 
 
 .. py:function:: q.csv
 
-   csv global
+   comma delimiter
 
-   See also `csv on code.kx.com <http://code.kx.com/wiki/Reference/csv>`_.
+   See also `csv on code.kx.com <http://code.kx.com/q/ref/filewords/#csv>`_.
 
 
 .. py:function:: q.cut
 
-   cut verb
+   cut
 
-   See also `cut on code.kx.com <http://code.kx.com/wiki/Reference/cut>`_.
+   See also `cut on code.kx.com <http://code.kx.com/q/ref/lists/#_-cut>`_.
 
 
 .. py:function:: q.deltas
 
-   deltas function
+   differences between consecutive pairs
 
-   See also `deltas on code.kx.com <http://code.kx.com/wiki/Reference/deltas>`_.
+   See also `deltas on code.kx.com <http://code.kx.com/q/ref/arith-integer/#deltas>`_.
 
 
 .. py:function:: q.desc
 
-   descending sort function
+   descending sort
 
-   See also `desc on code.kx.com <http://code.kx.com/wiki/Reference/desc>`_.
+   See also `desc on code.kx.com <http://code.kx.com/q/ref/sort/#desc>`_.
 
 
 .. py:function:: q.dev
 
-   standard deviation function
+   standard deviation
 
-   See also `dev on code.kx.com <http://code.kx.com/wiki/Reference/dev>`_.
+   See also `dev on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#dev-standard-deviation>`_.
 
 
 .. py:function:: q.differ
 
-   differ function
+   flag differences in consecutive pairs
 
-   See also `differ on code.kx.com <http://code.kx.com/wiki/Reference/differ>`_.
+   See also `differ on code.kx.com <http://code.kx.com/q/ref/comparison/#differ>`_.
 
 
 .. py:function:: q.distinct
 
-   distinct function
+   unique items
 
-   See also `distinct on code.kx.com <http://code.kx.com/wiki/Reference/distinct>`_.
+   See also `distinct on code.kx.com <http://code.kx.com/q/ref/search/#distinct>`_.
 
 
 .. py:function:: q.div
 
-   integer division verb
+   integer division
 
-   See also `div on code.kx.com <http://code.kx.com/wiki/Reference/div>`_.
+   See also `div on code.kx.com <http://code.kx.com/q/ref/arith-integer/#div>`_.
 
 
 .. py:function:: q.dsave
 
-   dsave function
+   save global tables to disk
 
-   See also `dsave on code.kx.com <http://code.kx.com/wiki/Reference/dsave>`_.
-
-
-.. py:function:: q.each
-
-   each adverb
-
-   See also `each on code.kx.com <http://code.kx.com/wiki/Reference/each>`_.
+   See also `dsave on code.kx.com <http://code.kx.com/q/ref/filewords/#dsave>`_.
 
 
 .. py:function:: q.ej
 
-   equijoin verb
+   equi-join
 
-   See also `ej on code.kx.com <http://code.kx.com/wiki/Reference/ej>`_.
+   See also `ej on code.kx.com <http://code.kx.com/q/ref/joins/#ej-equi-join>`_.
 
 
 .. py:function:: q.ema
 
-   exponentially weighted moving average verb
+   exponentially-weighted moving average
 
-   See also `ema on code.kx.com <http://code.kx.com/wiki/Reference/ema>`_.
+   See also `ema on code.kx.com <http://code.kx.com/q/ref/stats-moving/#ema>`_.
 
 
 .. py:function:: q.ema
 
-   exponentially weighted moving average verb
+   exponentially-weighted moving average
 
-   See also `ema on code.kx.com <http://code.kx.com/wiki/Reference/ema>`_.
+   See also `ema on code.kx.com <http://code.kx.com/q/ref/stats-moving/#ema>`_.
 
 
 .. py:function:: q.enlist
 
-   enlist function
+   arguments as a list
 
-   See also `enlist on code.kx.com <http://code.kx.com/wiki/Reference/enlist>`_.
+   See also `enlist on code.kx.com <http://code.kx.com/q/ref/lists/#enlist>`_.
 
 
 .. py:function:: q.eval
 
-   eval function
+   evaluate a parse tree
 
-   See also `eval on code.kx.com <http://code.kx.com/wiki/Reference/eval>`_.
+   See also `eval on code.kx.com <http://code.kx.com/q/ref/parsetrees/#eval>`_.
 
 
 .. py:function:: q.except_
 
-   except verb
+   left argument without items in right argument
 
-   See also `except on code.kx.com <http://code.kx.com/wiki/Reference/except>`_.
+   See also `except on code.kx.com <http://code.kx.com/q/ref/select/#except>`_.
 
 
 .. py:function:: q.exp
 
-   exp function
+   power of e
 
-   See also `exp on code.kx.com <http://code.kx.com/wiki/Reference/exp>`_.
+   See also `exp on code.kx.com <http://code.kx.com/q/ref/arith-float/#exp>`_.
 
 
 .. py:function:: q.fby
 
    filter-by
 
-   See also `fby on code.kx.com <http://code.kx.com/wiki/Reference/fby>`_.
+   See also `fby on code.kx.com <http://code.kx.com/q/ref/qsql/#fby>`_.
 
 
 .. py:function:: q.fills
 
-   fills function
+   forward-fill nulls
 
-   See also `fills on code.kx.com <http://code.kx.com/wiki/Reference/fills>`_.
+   See also `fills on code.kx.com <http://code.kx.com/q/ref/lists/#fills>`_.
 
 
 .. py:function:: q.first
 
-   first function
+   first item
 
-   See also `first on code.kx.com <http://code.kx.com/wiki/Reference/first>`_.
+   See also `first on code.kx.com <http://code.kx.com/q/ref/select/#first>`_.
 
 
 .. py:function:: q.fkeys
 
-   fkeys function
+   foreign-key columns mapped to their tables
 
-   See also `fkeys on code.kx.com <http://code.kx.com/wiki/Reference/fkeys>`_.
+   See also `fkeys on code.kx.com <http://code.kx.com/q/ref/metadata/#fkeys>`_.
 
 
 .. py:function:: q.flip
 
-   flip function
+   transpose
 
-   See also `flip on code.kx.com <http://code.kx.com/wiki/Reference/flip>`_.
+   See also `flip on code.kx.com <http://code.kx.com/q/ref/lists/#flip>`_.
 
 
 .. py:function:: q.floor
 
-   floor function
+   greatest integer less than argument
 
-   See also `floor on code.kx.com <http://code.kx.com/wiki/Reference/floor>`_.
+   See also `floor on code.kx.com <http://code.kx.com/q/ref/arith-integer/#floor>`_.
 
 
 .. py:function:: q.get
 
-   get function
+   get
 
-   See also `get on code.kx.com <http://code.kx.com/wiki/Reference/get>`_.
+   See also `get on code.kx.com <http://code.kx.com/q/ref/dotz/#zpg-get>`_.
 
 
 .. py:function:: q.getenv
 
-   getenv function
+   value of an environment variable
 
-   See also `getenv on code.kx.com <http://code.kx.com/wiki/Reference/getenv>`_.
+   See also `getenv on code.kx.com <http://code.kx.com/q/ref/os/#getenv>`_.
 
 
 .. py:function:: q.group
 
-   group function
+   dictionary of distinct items
 
-   See also `group on code.kx.com <http://code.kx.com/wiki/Reference/group>`_.
+   See also `group on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#group>`_.
 
 
 .. py:function:: q.gtime
 
-   gtime function
+   UTC timestamp
 
-   See also `gtime on code.kx.com <http://code.kx.com/wiki/Reference/gtime>`_.
+   See also `gtime on code.kx.com <http://code.kx.com/q/ref/os/#gtime>`_.
 
 
 .. py:function:: q.hclose
 
-   hclose function
+   close a file or process
 
-   See also `hclose on code.kx.com <http://code.kx.com/wiki/Reference/hclose>`_.
+   See also `hclose on code.kx.com <http://code.kx.com/q/ref/filewords/#hclose>`_.
 
 
 .. py:function:: q.hcount
 
-   hcount function
+   size of a file
 
-   See also `hcount on code.kx.com <http://code.kx.com/wiki/Reference/hcount>`_.
+   See also `hcount on code.kx.com <http://code.kx.com/q/ref/filewords/#hcount>`_.
 
 
 .. py:function:: q.hdel
 
-   hdel function
+   delete a file
 
-   See also `hdel on code.kx.com <http://code.kx.com/wiki/Reference/hdel>`_.
+   See also `hdel on code.kx.com <http://code.kx.com/q/ref/filewords/#hdel>`_.
 
 
 .. py:function:: q.hopen
 
-   hopen function
+   open a file
 
-   See also `hopen on code.kx.com <http://code.kx.com/wiki/Reference/hopen>`_.
+   See also `hopen on code.kx.com <http://code.kx.com/q/ref/filewords/#hopen>`_.
 
 
 .. py:function:: q.hsym
 
-   hsym function
+   convert symbol to filename or IP address
 
-   See also `hsym on code.kx.com <http://code.kx.com/wiki/Reference/hsym>`_.
+   See also `hsym on code.kx.com <http://code.kx.com/q/ref/filewords/#hsym>`_.
 
 
 .. py:function:: q.iasc
 
-   ascending function
+   indices of ascending sort
 
-   See also `iasc on code.kx.com <http://code.kx.com/wiki/Reference/iasc>`_.
+   See also `iasc on code.kx.com <http://code.kx.com/q/ref/sort/#iasc>`_.
 
 
 .. py:function:: q.idesc
 
-   descending function
+   indices of descending sort
 
-   See also `idesc on code.kx.com <http://code.kx.com/wiki/Reference/idesc>`_.
+   See also `idesc on code.kx.com <http://code.kx.com/q/ref/sort/#idesc>`_.
 
 
 .. py:function:: q.ij
 
-   inner join verb
+   inner join
 
-   See also `ij on code.kx.com <http://code.kx.com/wiki/Reference/ij>`_.
+   See also `ij on code.kx.com <http://code.kx.com/q/ref/joins/#ij-inner-join>`_.
 
 
 .. py:function:: q.ijf
 
    The ijf function.
 
-   See also `ijf on code.kx.com <http://code.kx.com/wiki/Reference/ijf>`_.
+   See also `ijf on code.kx.com <http://code.kx.com/q/ref/joins/#ij-inner-join>`_.
 
 
 .. py:function:: q.in_
 
-   membership verb
+   membership
 
-   See also `in on code.kx.com <http://code.kx.com/wiki/Reference/in>`_.
+   See also `in on code.kx.com <http://code.kx.com/q/ref/search/#in>`_.
 
 
 .. py:function:: q.insert
 
-   insert verb
+   append records to a table
 
-   See also `insert on code.kx.com <http://code.kx.com/wiki/Reference/insert>`_.
+   See also `insert on code.kx.com <http://code.kx.com/q/ref/qsql/#insert>`_.
 
 
 .. py:function:: q.inter
 
-   intersect verb
+   items common to both arguments
 
-   See also `inter on code.kx.com <http://code.kx.com/wiki/Reference/inter>`_.
+   See also `inter on code.kx.com <http://code.kx.com/q/ref/select/#inter>`_.
 
 
 .. py:function:: q.inv
 
-   inverse function
+   matrix inverse
 
-   See also `inv on code.kx.com <http://code.kx.com/wiki/Reference/inv>`_.
+   See also `inv on code.kx.com <http://code.kx.com/q/ref/matrixes/#inv>`_.
 
 
 .. py:function:: q.key
 
-   key function
+   key
 
-   See also `key on code.kx.com <http://code.kx.com/wiki/Reference/key>`_.
+   See also `key on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#key>`_.
 
 
 .. py:function:: q.keys
 
-   keys function
+   names of a table's columns
 
-   See also `keys on code.kx.com <http://code.kx.com/wiki/Reference/keys>`_.
+   See also `keys on code.kx.com <http://code.kx.com/q/ref/metadata/#keys>`_.
 
 
 .. py:function:: q.last
 
-   last function
+   last item
 
-   See also `last on code.kx.com <http://code.kx.com/wiki/Reference/last>`_.
+   See also `last on code.kx.com <http://code.kx.com/q/ref/select/#last>`_.
 
 
 .. py:function:: q.like
 
-   pattern matching verb
+   pattern matching
 
-   See also `like on code.kx.com <http://code.kx.com/wiki/Reference/like>`_.
+   See also `like on code.kx.com <http://code.kx.com/q/ref/strings/#like>`_.
 
 
 .. py:function:: q.lj
 
-   left join verb
+   left join
 
-   See also `lj on code.kx.com <http://code.kx.com/wiki/Reference/lj>`_.
+   See also `lj on code.kx.com <http://code.kx.com/q/ref/joins/#lj-ljf-left-join>`_.
 
 
 .. py:function:: q.ljf
 
-   The ljf function.
+   left join
 
-   See also `ljf on code.kx.com <http://code.kx.com/wiki/Reference/ljf>`_.
+   See also `ljf on code.kx.com <http://code.kx.com/q/ref/joins/#lj-ljf-left-join>`_.
 
 
 .. py:function:: q.load
 
-   load function
+   load binary data
 
-   See also `load on code.kx.com <http://code.kx.com/wiki/Reference/load>`_.
+   See also `load on code.kx.com <http://code.kx.com/q/ref/filewords/#load>`_.
 
 
 .. py:function:: q.log
 
-   log function
+   natural logarithm
 
-   See also `log on code.kx.com <http://code.kx.com/wiki/Reference/log>`_.
+   See also `log on code.kx.com <http://code.kx.com/q/ref/arith-float/#log>`_.
 
 
 .. py:function:: q.lower
 
-   lowercase function
+   lower case
 
-   See also `lower on code.kx.com <http://code.kx.com/wiki/Reference/lower>`_.
+   See also `lower on code.kx.com <http://code.kx.com/q/ref/strings/#lower>`_.
 
 
 .. py:function:: q.lsq
 
-   least squares verb
+   least squares  matrix divide
 
-   See also `lsq on code.kx.com <http://code.kx.com/wiki/Reference/lsq>`_.
+   See also `lsq on code.kx.com <http://code.kx.com/q/ref/matrixes/#lsq>`_.
 
 
 .. py:function:: q.ltime
 
-   ltime function
+   local timestamp
 
-   See also `ltime on code.kx.com <http://code.kx.com/wiki/Reference/ltime>`_.
+   See also `ltime on code.kx.com <http://code.kx.com/q/ref/os/#ltime>`_.
 
 
 .. py:function:: q.ltrim
 
-   left trim function
+   function remove leading spaces
 
-   See also `ltrim on code.kx.com <http://code.kx.com/wiki/Reference/ltrim>`_.
+   See also `ltrim on code.kx.com <http://code.kx.com/q/ref/strings/#ltrim>`_.
 
 
 .. py:function:: q.mavg
 
-   moving average verb
+   moving average
 
-   See also `mavg on code.kx.com <http://code.kx.com/wiki/Reference/mavg>`_.
+   See also `mavg on code.kx.com <http://code.kx.com/q/ref/stats-moving/#mavg>`_.
 
 
 .. py:function:: q.max
 
-   maximum function
+   maximum
 
-   See also `max on code.kx.com <http://code.kx.com/wiki/Reference/max>`_.
+   See also `max on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#max-maximum>`_.
 
 
 .. py:function:: q.maxs
 
-   maximums function
+   maxima of preceding items
 
-   See also `maxs on code.kx.com <http://code.kx.com/wiki/Reference/maxs>`_.
+   See also `maxs on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#maxs-maximums>`_.
 
 
 .. py:function:: q.mcount
 
-   moving count verb
+   moving count
 
-   See also `mcount on code.kx.com <http://code.kx.com/wiki/Reference/mcount>`_.
+   See also `mcount on code.kx.com <http://code.kx.com/q/ref/stats-moving/#mcount>`_.
 
 
 .. py:function:: q.md5
 
-   md5 function
+   MD5 hash
 
-   See also `md5 on code.kx.com <http://code.kx.com/wiki/Reference/md5>`_.
+   See also `md5 on code.kx.com <http://code.kx.com/q/ref/strings/#md5>`_.
 
 
 .. py:function:: q.mdev
 
-   moving deviation verb
+   moving deviation
 
-   See also `mdev on code.kx.com <http://code.kx.com/wiki/Reference/mdev>`_.
+   See also `mdev on code.kx.com <http://code.kx.com/q/ref/stats-moving/#mdev>`_.
 
 
 .. py:function:: q.med
 
-   median function
+   median
 
-   See also `med on code.kx.com <http://code.kx.com/wiki/Reference/med>`_.
+   See also `med on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#med-median>`_.
 
 
 .. py:function:: q.meta
 
-   meta data function
+   metadata of a table
 
-   See also `meta on code.kx.com <http://code.kx.com/wiki/Reference/meta>`_.
+   See also `meta on code.kx.com <http://code.kx.com/q/ref/metadata/#meta>`_.
 
 
 .. py:function:: q.min
 
-   minimum function
+   minimum
 
-   See also `min on code.kx.com <http://code.kx.com/wiki/Reference/min>`_.
+   See also `min on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#min-minimum>`_.
 
 
 .. py:function:: q.mins
 
-   minimums function
+   minimum of preceding items
 
-   See also `mins on code.kx.com <http://code.kx.com/wiki/Reference/mins>`_.
+   See also `mins on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#mins-minimums>`_.
 
 
 .. py:function:: q.mmax
 
-   moving maximum verb
+   moving maxima
 
-   See also `mmax on code.kx.com <http://code.kx.com/wiki/Reference/mmax>`_.
+   See also `mmax on code.kx.com <http://code.kx.com/q/ref/stats-moving/#mmax>`_.
 
 
 .. py:function:: q.mmin
 
-   moving minimum verb
+   moving minima
 
-   See also `mmin on code.kx.com <http://code.kx.com/wiki/Reference/mmin>`_.
+   See also `mmin on code.kx.com <http://code.kx.com/q/ref/stats-moving/#mmin>`_.
 
 
 .. py:function:: q.mmu
 
-   matrix multiplication verb
+   mmu
 
-   See also `mmu on code.kx.com <http://code.kx.com/wiki/Reference/mmu>`_.
+   See also `mmu on code.kx.com <http://code.kx.com/q/ref/matrixes/#mmu>`_.
 
 
 .. py:function:: q.mod
 
-   modulus verb
+   remainder
 
-   See also `mod on code.kx.com <http://code.kx.com/wiki/Reference/mod>`_.
+   See also `mod on code.kx.com <http://code.kx.com/q/ref/arith-integer/#mod>`_.
 
 
 .. py:function:: q.msum
 
-   moving sum verb
+   moving sum
 
-   See also `msum on code.kx.com <http://code.kx.com/wiki/Reference/msum>`_.
+   See also `msum on code.kx.com <http://code.kx.com/q/ref/stats-moving/#msum>`_.
 
 
 .. py:function:: q.neg
 
-   negative function
+   negate
 
-   See also `neg on code.kx.com <http://code.kx.com/wiki/Reference/neg>`_.
+   See also `neg on code.kx.com <http://code.kx.com/q/ref/arith-integer/#neg>`_.
 
 
 .. py:function:: q.next
 
-   next function
+   next items
 
-   See also `next on code.kx.com <http://code.kx.com/wiki/Reference/next>`_.
+   See also `next on code.kx.com <http://code.kx.com/q/ref/select/#next>`_.
 
 
 .. py:function:: q.not_
 
-   logical not function
+   not
 
-   See also `not on code.kx.com <http://code.kx.com/wiki/Reference/not>`_.
+   See also `not on code.kx.com <http://code.kx.com/q/ref/comparison/#six-comparison-operators>`_.
 
 
 .. py:function:: q.null
 
-   null function
+   null
 
-   See also `null on code.kx.com <http://code.kx.com/wiki/Reference/null>`_.
+   See also `null on code.kx.com <http://code.kx.com/q/ref/unclassified/#null>`_.
 
 
 .. py:function:: q.or_
 
-   or verb
-
-   See also `or on code.kx.com <http://code.kx.com/wiki/Reference/or>`_.
-
+   or
 
-.. py:function:: q.over
-
-   over adverb
-
-   See also `over on code.kx.com <http://code.kx.com/wiki/Reference/over>`_.
+   See also `or on code.kx.com <http://code.kx.com/q/ref/logic/#or-maximum>`_.
 
 
 .. py:function:: q.parse
 
-   parse function
+   parse a string
 
-   See also `parse on code.kx.com <http://code.kx.com/wiki/Reference/parse>`_.
+   See also `parse on code.kx.com <http://code.kx.com/q/ref/parsetrees/#parse>`_.
 
 
 .. py:function:: q.peach
 
-   parallel each adverb
+   peach
 
-   See also `peach on code.kx.com <http://code.kx.com/wiki/Reference/peach>`_.
+   See also `peach on code.kx.com <http://code.kx.com/q/ref/dotz/#zpd-peach-handles>`_.
 
 
 .. py:function:: q.pj
 
-   plus join verb
+   plus join
 
-   See also `pj on code.kx.com <http://code.kx.com/wiki/Reference/pj>`_.
+   See also `pj on code.kx.com <http://code.kx.com/q/ref/joins/#pj-plus-join>`_.
 
 
 .. py:function:: q.prd
 
-   product function
+   product
 
-   See also `prd on code.kx.com <http://code.kx.com/wiki/Reference/prd>`_.
+   See also `prd on code.kx.com <http://code.kx.com/q/ref/arith-float/#prd>`_.
 
 
 .. py:function:: q.prds
 
-   cumulative product function
+   cumulative products
 
-   See also `prds on code.kx.com <http://code.kx.com/wiki/Reference/prds>`_.
+   See also `prds on code.kx.com <http://code.kx.com/q/ref/arith-float/#prds>`_.
 
 
 .. py:function:: q.prev
 
-   prev function
+   previous items
 
-   See also `prev on code.kx.com <http://code.kx.com/wiki/Reference/prev>`_.
+   See also `prev on code.kx.com <http://code.kx.com/q/ref/select/#prev>`_.
 
 
 .. py:function:: q.prior
 
-   prior function
+   prior
 
-   See also `prior on code.kx.com <http://code.kx.com/wiki/Reference/prior>`_.
+   See also `prior on code.kx.com <http://code.kx.com/q/ref/control/#prior>`_.
 
 
 .. py:function:: q.rand
 
-   random function
+   random number
 
-   See also `rand on code.kx.com <http://code.kx.com/wiki/Reference/rand>`_.
+   See also `rand on code.kx.com <http://code.kx.com/q/ref/random/#rand>`_.
 
 
 .. py:function:: q.rank
 
-   rank function
+   grade up
 
-   See also `rank on code.kx.com <http://code.kx.com/wiki/Reference/rank>`_.
+   See also `rank on code.kx.com <http://code.kx.com/q/ref/sort/#rank>`_.
 
 
 .. py:function:: q.ratios
 
-   ratios function
+   ratios of consecutive pairs
 
-   See also `ratios on code.kx.com <http://code.kx.com/wiki/Reference/ratios>`_.
+   See also `ratios on code.kx.com <http://code.kx.com/q/ref/arith-float/#ratios>`_.
 
 
 .. py:function:: q.raze
 
-   raze function
+   join items
 
-   See also `raze on code.kx.com <http://code.kx.com/wiki/Reference/raze>`_.
+   See also `raze on code.kx.com <http://code.kx.com/q/ref/lists/#raze>`_.
 
 
 .. py:function:: q.read0
 
-   file read function
+   read file as lines
 
-   See also `read0 on code.kx.com <http://code.kx.com/wiki/Reference/read0>`_.
+   See also `read0 on code.kx.com <http://code.kx.com/q/ref/filewords/#read0>`_.
 
 
 .. py:function:: q.read1
 
-   file read function
+   read file as bytes
 
-   See also `read1 on code.kx.com <http://code.kx.com/wiki/Reference/read1>`_.
+   See also `read1 on code.kx.com <http://code.kx.com/q/ref/filewords/#read1>`_.
 
 
 .. py:function:: q.reciprocal
 
-   reciprocal function
+   reciprocal of a number
 
-   See also `reciprocal on code.kx.com <http://code.kx.com/wiki/Reference/reciprocal>`_.
+   See also `reciprocal on code.kx.com <http://code.kx.com/q/ref/arith-float/#reciprocal>`_.
 
 
 .. py:function:: q.reval
 
-   reval function
-
-   See also `reval on code.kx.com <http://code.kx.com/wiki/Reference/reval>`_.
-
-
-.. py:function:: q.reval
+   variation of eval
 
-   reval function
-
-   See also `reval on code.kx.com <http://code.kx.com/wiki/Reference/reval>`_.
+   See also `reval on code.kx.com <http://code.kx.com/q/ref/parsetrees/#reval>`_.
 
 
 .. py:function:: q.reverse
 
-   reverse function
+   reverse the order of items
 
-   See also `reverse on code.kx.com <http://code.kx.com/wiki/Reference/reverse>`_.
+   See also `reverse on code.kx.com <http://code.kx.com/q/ref/lists/#reverse>`_.
 
 
 .. py:function:: q.rload
 
-   rload function
+   load a splayed table
 
-   See also `rload on code.kx.com <http://code.kx.com/wiki/Reference/rload>`_.
+   See also `rload on code.kx.com <http://code.kx.com/q/ref/filewords/#rload>`_.
 
 
 .. py:function:: q.rotate
 
-   rotate verb
+   rotate items
 
-   See also `rotate on code.kx.com <http://code.kx.com/wiki/Reference/rotate>`_.
+   See also `rotate on code.kx.com <http://code.kx.com/q/ref/lists/#rotate>`_.
 
 
 .. py:function:: q.rsave
 
-   rsave function
+   rsave
 
-   See also `rsave on code.kx.com <http://code.kx.com/wiki/Reference/rsave>`_.
+   See also `rsave on code.kx.com <http://code.kx.com/q/ref/filewords/#rsave>`_.
 
 
 .. py:function:: q.rtrim
 
-   right trim function
+   remove trailing spaces
 
-   See also `rtrim on code.kx.com <http://code.kx.com/wiki/Reference/rtrim>`_.
+   See also `rtrim on code.kx.com <http://code.kx.com/q/ref/strings/#rtrim>`_.
 
 
 .. py:function:: q.save
 
-   save function
-
-   See also `save on code.kx.com <http://code.kx.com/wiki/Reference/save>`_.
-
+   save global data to file
 
-.. py:function:: q.scan
-
-   scan adverb
-
-   See also `scan on code.kx.com <http://code.kx.com/wiki/Reference/scan>`_.
+   See also `save on code.kx.com <http://code.kx.com/q/ref/filewords/#save>`_.
 
 
 .. py:function:: q.scov
 
-   statistical covariance verb
+   statistical covariance
 
-   See also `scov on code.kx.com <http://code.kx.com/wiki/Reference/scov>`_.
+   See also `scov on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#scov-statistical-covariance>`_.
 
 
 .. py:function:: q.scov
 
-   statistical covariance verb
+   statistical covariance
 
-   See also `scov on code.kx.com <http://code.kx.com/wiki/Reference/scov>`_.
+   See also `scov on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#scov-statistical-covariance>`_.
 
 
 .. py:function:: q.sdev
 
-   statistical standard deviation function
+   statistical standard deviation
 
-   See also `sdev on code.kx.com <http://code.kx.com/wiki/Reference/sdev>`_.
+   See also `sdev on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#sdev-statistical-standard-deviation>`_.
 
 
 .. py:function:: q.sdev
 
-   statistical standard deviation function
+   statistical standard deviation
 
-   See also `sdev on code.kx.com <http://code.kx.com/wiki/Reference/sdev>`_.
+   See also `sdev on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#sdev-statistical-standard-deviation>`_.
 
 
 .. py:function:: q.set
 
-   set verb
+   set
 
-   See also `set on code.kx.com <http://code.kx.com/wiki/Reference/set>`_.
+   See also `set on code.kx.com <http://code.kx.com/q/ref/dotz/#zps-set>`_.
 
 
 .. py:function:: q.setenv
 
-   setenv verb
+   set an environment variable
 
-   See also `setenv on code.kx.com <http://code.kx.com/wiki/Reference/setenv>`_.
+   See also `setenv on code.kx.com <http://code.kx.com/q/ref/os/#setenv>`_.
 
 
 .. py:function:: q.show
 
-   show function
+   format to the console
 
-   See also `show on code.kx.com <http://code.kx.com/wiki/Reference/show>`_.
+   See also `show on code.kx.com <http://code.kx.com/q/ref/devtools/#show>`_.
 
 
 .. py:function:: q.signum
 
-   signum function
+   sign of its argument/s
 
-   See also `signum on code.kx.com <http://code.kx.com/wiki/Reference/signum>`_.
+   See also `signum on code.kx.com <http://code.kx.com/q/ref/arith-integer/#signum>`_.
 
 
 .. py:function:: q.sin
 
-   sine function
+   sine
 
-   See also `sin on code.kx.com <http://code.kx.com/wiki/Reference/sin>`_.
+   See also `sin on code.kx.com <http://code.kx.com/q/ref/trig/#sin>`_.
 
 
 .. py:function:: q.sqrt
 
-   square root function
+   square root
 
-   See also `sqrt on code.kx.com <http://code.kx.com/wiki/Reference/sqrt>`_.
+   See also `sqrt on code.kx.com <http://code.kx.com/q/ref/arith-float/#sqrt>`_.
 
 
 .. py:function:: q.ss
 
-   string search function
+   string search
 
-   See also `ss on code.kx.com <http://code.kx.com/wiki/Reference/ss>`_.
+   See also `ss on code.kx.com <http://code.kx.com/q/ref/strings/#ss>`_.
 
 
 .. py:function:: q.ssr
 
-   string search replace function
+   string search and replace
 
-   See also `ssr on code.kx.com <http://code.kx.com/wiki/Reference/ssr>`_.
+   See also `ssr on code.kx.com <http://code.kx.com/q/ref/strings/#ssr>`_.
 
 
 .. py:function:: q.string
 
-   string function
+   cast to string
 
-   See also `string on code.kx.com <http://code.kx.com/wiki/Reference/string>`_.
+   See also `string on code.kx.com <http://code.kx.com/q/ref/casting/#string>`_.
 
 
 .. py:function:: q.sublist
 
-   sublist verb
+   sublist of a list
 
-   See also `sublist on code.kx.com <http://code.kx.com/wiki/Reference/sublist>`_.
+   See also `sublist on code.kx.com <http://code.kx.com/q/ref/select/#sublist>`_.
 
 
 .. py:function:: q.sum
 
-   sum function
+   sum of a list
 
-   See also `sum on code.kx.com <http://code.kx.com/wiki/Reference/sum>`_.
+   See also `sum on code.kx.com <http://code.kx.com/q/ref/arith-integer/#sum>`_.
 
 
 .. py:function:: q.sums
 
-   cumulative sum function
+   cumulative sums of a list
 
-   See also `sums on code.kx.com <http://code.kx.com/wiki/Reference/sums>`_.
+   See also `sums on code.kx.com <http://code.kx.com/q/ref/arith-integer/#sums>`_.
 
 
 .. py:function:: q.sv
 
-   scalar from vector verb
+   consolidate
 
-   See also `sv on code.kx.com <http://code.kx.com/wiki/Reference/sv>`_.
+   See also `sv on code.kx.com <http://code.kx.com/q/ref/lists/#sv>`_.
 
 
 .. py:function:: q.svar
 
-   statistical variance function
+   statistical variance
 
-   See also `svar on code.kx.com <http://code.kx.com/wiki/Reference/svar>`_.
+   See also `svar on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#svar-statistical-variance>`_.
 
 
 .. py:function:: q.svar
 
-   statistical variance function
+   statistical variance
 
-   See also `svar on code.kx.com <http://code.kx.com/wiki/Reference/svar>`_.
+   See also `svar on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#svar-statistical-variance>`_.
 
 
 .. py:function:: q.system
 
-   system command function
+   system
 
-   See also `system on code.kx.com <http://code.kx.com/wiki/Reference/system>`_.
+   See also `system on code.kx.com <http://code.kx.com/q/ref/syscmds>`_.
 
 
 .. py:function:: q.tables
 
-   tables function
+   sorted list of tables
 
-   See also `tables on code.kx.com <http://code.kx.com/wiki/Reference/tables>`_.
+   See also `tables on code.kx.com <http://code.kx.com/q/ref/metadata/#tables>`_.
 
 
 .. py:function:: q.tan
 
-   tangent function
+   tangent
 
-   See also `tan on code.kx.com <http://code.kx.com/wiki/Reference/tan>`_.
+   See also `tan on code.kx.com <http://code.kx.com/q/ref/trig/#tan>`_.
 
 
 .. py:function:: q.til
 
-   til function
+   integers up to x
 
-   See also `til on code.kx.com <http://code.kx.com/wiki/Reference/til>`_.
+   See also `til on code.kx.com <http://code.kx.com/q/ref/arith-integer/#til>`_.
 
 
 .. py:function:: q.trim
 
-   trim function
+   remove leading and trailing spaces
 
-   See also `trim on code.kx.com <http://code.kx.com/wiki/Reference/trim>`_.
+   See also `trim on code.kx.com <http://code.kx.com/q/ref/strings/#trim>`_.
 
 
 .. py:function:: q.type
 
-   type function
+   data type
 
-   See also `type on code.kx.com <http://code.kx.com/wiki/Reference/type>`_.
+   See also `type on code.kx.com <http://code.kx.com/q/ref/metadata/#type>`_.
 
 
 .. py:function:: q.uj
 
-   union join verb
+   union join
+
+   See also `uj on code.kx.com <http://code.kx.com/q/ref/joins/#uj-union-join>`_.
 
-   See also `uj on code.kx.com <http://code.kx.com/wiki/Reference/uj>`_.
+
+.. py:function:: q.ujf
+
+   The ujf function.
+
+   See also `ujf on code.kx.com <http://code.kx.com/q/ref/joins/#uj-union-join>`_.
 
 
 .. py:function:: q.ungroup
 
-   ungroup function
+   flattened table
 
-   See also `ungroup on code.kx.com <http://code.kx.com/wiki/Reference/ungroup>`_.
+   See also `ungroup on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#ungroup>`_.
 
 
 .. py:function:: q.union
 
-   union verb
+   distinct items of combination of two lists
 
-   See also `union on code.kx.com <http://code.kx.com/wiki/Reference/union>`_.
+   See also `union on code.kx.com <http://code.kx.com/q/ref/select/#union>`_.
 
 
 .. py:function:: q.upper
 
-   uppercase function
+   upper-case
 
-   See also `upper on code.kx.com <http://code.kx.com/wiki/Reference/upper>`_.
+   See also `upper on code.kx.com <http://code.kx.com/q/ref/strings/#upper>`_.
 
 
 .. py:function:: q.upsert
 
-   upsert verb
+   add table records
 
-   See also `upsert on code.kx.com <http://code.kx.com/wiki/Reference/upsert>`_.
+   See also `upsert on code.kx.com <http://code.kx.com/q/ref/qsql/#upsert>`_.
 
 
 .. py:function:: q.value
 
-   value function
+   value
 
-   See also `value on code.kx.com <http://code.kx.com/wiki/Reference/value>`_.
+   See also `value on code.kx.com <http://code.kx.com/q/ref/dotz/#zvs-value-set>`_.
 
 
 .. py:function:: q.var
 
-   variance function
+   variance
 
-   See also `var on code.kx.com <http://code.kx.com/wiki/Reference/var>`_.
+   See also `var on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#var-variance>`_.
 
 
 .. py:function:: q.view
 
-   view function
+   definition of a dependency
 
-   See also `view on code.kx.com <http://code.kx.com/wiki/Reference/view>`_.
+   See also `view on code.kx.com <http://code.kx.com/q/ref/metadata/#view>`_.
 
 
 .. py:function:: q.views
 
-   views function
+   list of defined views
 
-   See also `views on code.kx.com <http://code.kx.com/wiki/Reference/views>`_.
+   See also `views on code.kx.com <http://code.kx.com/q/ref/environment/#views>`_.
 
 
 .. py:function:: q.vs
 
-   vector from scalar verb
+   split
 
-   See also `vs on code.kx.com <http://code.kx.com/wiki/Reference/vs>`_.
+   See also `vs on code.kx.com <http://code.kx.com/q/ref/lists/#vs>`_.
 
 
 .. py:function:: q.wavg
 
-   weighted average verb
+   weighted average
 
-   See also `wavg on code.kx.com <http://code.kx.com/wiki/Reference/wavg>`_.
+   See also `wavg on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#wavg-weighted-average>`_.
 
 
 .. py:function:: q.where
 
-   where function
+   replicated items
 
-   See also `where on code.kx.com <http://code.kx.com/wiki/Reference/where>`_.
+   See also `where on code.kx.com <http://code.kx.com/q/ref/select/#where>`_.
 
 
 .. py:function:: q.within
 
-   within verb
+   flag items within range
 
-   See also `within on code.kx.com <http://code.kx.com/wiki/Reference/within>`_.
+   See also `within on code.kx.com <http://code.kx.com/q/ref/search/#within>`_.
 
 
 .. py:function:: q.wj
 
-   window join function
+   window join
 
-   See also `wj on code.kx.com <http://code.kx.com/wiki/Reference/wj>`_.
+   See also `wj on code.kx.com <http://code.kx.com/q/ref/joins/#wj-wj1-window-join>`_.
 
 
 .. py:function:: q.wj1
 
-   The wj1 function.
+   window join
 
-   See also `wj1 on code.kx.com <http://code.kx.com/wiki/Reference/wj1>`_.
+   See also `wj1 on code.kx.com <http://code.kx.com/q/ref/joins/#wj-wj1-window-join>`_.
 
 
 .. py:function:: q.wsum
 
-   weighted sum verb
+   weighted sum
 
-   See also `wsum on code.kx.com <http://code.kx.com/wiki/Reference/wsum>`_.
+   See also `wsum on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#wsum-weighted-sum>`_.
 
 
 .. py:function:: q.ww
 
    The ww function.
 
-   See also `ww on code.kx.com <http://code.kx.com/wiki/Reference/ww>`_.
+   See also `ww on code.kx.com <http://code.kx.com/q/ref/stats-aggregates/#wsum-weighted-sum>`_.
 
 
 .. py:function:: q.xasc
 
-   ascending sort verb
+   table sorted ascending by columns
 
-   See also `xasc on code.kx.com <http://code.kx.com/wiki/Reference/xasc>`_.
+   See also `xasc on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xasc>`_.
 
 
 .. py:function:: q.xbar
 
-   interval bar verb
+   interval bar
 
-   See also `xbar on code.kx.com <http://code.kx.com/wiki/Reference/xbar>`_.
+   See also `xbar on code.kx.com <http://code.kx.com/q/ref/arith-integer/#xbar>`_.
 
 
 .. py:function:: q.xcol
 
-   rename columns verb
+   rename table columns
 
-   See also `xcol on code.kx.com <http://code.kx.com/wiki/Reference/xcol>`_.
+   See also `xcol on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xcol>`_.
 
 
 .. py:function:: q.xcols
 
-   reorder columns verb
+   re-order table columns
 
-   See also `xcols on code.kx.com <http://code.kx.com/wiki/Reference/xcols>`_.
+   See also `xcols on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xcols>`_.
 
 
 .. py:function:: q.xdesc
 
-   descending sort verb
+   table sorted descending by columns
 
-   See also `xdesc on code.kx.com <http://code.kx.com/wiki/Reference/xdesc>`_.
+   See also `xdesc on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xdesc>`_.
 
 
 .. py:function:: q.xexp
 
-   power verb
+   raised to a power
 
-   See also `xexp on code.kx.com <http://code.kx.com/wiki/Reference/xexp>`_.
+   See also `xexp on code.kx.com <http://code.kx.com/q/ref/arith-float/#xexp>`_.
 
 
 .. py:function:: q.xgroup
 
-   grouping verb
+   table grouped by keys
 
-   See also `xgroup on code.kx.com <http://code.kx.com/wiki/Reference/xgroup>`_.
+   See also `xgroup on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xgroup>`_.
 
 
 .. py:function:: q.xkey
 
-   set primary key verb
+   set primary keys of a table
 
-   See also `xkey on code.kx.com <http://code.kx.com/wiki/Reference/xkey>`_.
+   See also `xkey on code.kx.com <http://code.kx.com/q/ref/dictsandtables/#xkey>`_.
 
 
 .. py:function:: q.xlog
 
-   base-x log verb
+   base-x logarithm
 
-   See also `xlog on code.kx.com <http://code.kx.com/wiki/Reference/xlog>`_.
+   See also `xlog on code.kx.com <http://code.kx.com/q/ref/arith-float/#xlog>`_.
 
 
 .. py:function:: q.xprev
 
-   previous verb
+   previous items
 
-   See also `xprev on code.kx.com <http://code.kx.com/wiki/Reference/xprev>`_.
+   See also `xprev on code.kx.com <http://code.kx.com/q/ref/select/#xprev>`_.
 
 
 .. py:function:: q.xrank
 
-   buckets verb
+   items assigned to buckets
+
+   See also `xrank on code.kx.com <http://code.kx.com/q/ref/sort/#xrank>`_.
+
 
-   See also `xrank on code.kx.com <http://code.kx.com/wiki/Reference/xrank>`_.
diff --git a/doc/whatsnew/changelog.rst b/doc/whatsnew/changelog.rst
index a5cdf05..e4a9da4 100644
--- a/doc/whatsnew/changelog.rst
+++ b/doc/whatsnew/changelog.rst
@@ -4,6 +4,26 @@
 Version History
 ===============
 
+`PyQ 4.0.2 <http://pyq.readthedocs.io/en/pyq-4.0.2/>`_
+------------------------------------------------------
+
+Released on 2017-05-12
+
+Enhancements:
+
+  - !523 - #909: Support installing PyQ on Ubuntu 16.04.
+  - !528 - #911: qp and pq: set console size in q when running ptpython scripts.
+  - !535 - #910: qp: exit from q) prompt on Ctrl-D.
+  - !536 - #912: qp: report error and exit if pre-loading fails.
+
+
+Documentation:
+
+  - !537 - #909: Added a guide on installing PyQ on Ubuntu.
+  - !533 - #914: Use new kx.code.com.
+
+
+
 `PyQ 4.0.1 <http://pyq.readthedocs.io/en/pyq-4.0.1/>`_
 ------------------------------------------------------
 
diff --git a/doc/words.txt b/doc/words.txt
index 27d1cc2..00e8bf9 100644
--- a/doc/words.txt
+++ b/doc/words.txt
@@ -116,3 +116,14 @@ ini
 sys
 fallback
 intersphinx
+equi
+filename
+maxima
+metadata
+minima
+mmu
+ujf
+Ubuntu
+ptpython
+Ctrl
+pre
diff --git a/setup.py b/setup.py
index a96de6a..4d5ade0 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@
     from platform import uname
 
 
-VERSION = '4.0.1'
+VERSION = '4.0.2'
 IS_RELEASE = True
 PYQ_SRC_DIR = os.path.join('src', 'pyq')
 VERSION_FILE = os.path.join(PYQ_SRC_DIR, 'version.py')
@@ -350,7 +350,7 @@ def finalize_options(self):
 
         self.q_module_rules.append((None, 'PYTHON:', 'PYTHON: "%s"\n' % python_path))
 
-        if platform == 'Darwin' or sys.version_info[0] >= 3:  # Issue #559
+        if platform == 'Darwin':  # Issue #559
             if virtual_env:
                 if sys.version_info[0] < 3:
                     lib_string = 'lib:"%s\\000"\n' % os.path.join(virtual_env, '.Python')
diff --git a/src/pyq/_pt_run.py b/src/pyq/_pt_run.py
index ff64640..69a5f94 100644
--- a/src/pyq/_pt_run.py
+++ b/src/pyq/_pt_run.py
@@ -1,5 +1,7 @@
 from __future__ import print_function
 import sys
+import os
+
 try:
     import ptpython.entry_points.run_ptpython as ptp
 except ImportError:
@@ -12,12 +14,28 @@
 from pyq import q, kerr
 
 
+def console_size(fd=1):
+    try:
+        import fcntl
+        import termios
+        import struct
+    except ImportError:
+        size = os.getenv('LINES', 25), os.getenv('COLUMNS', 80)
+    else:
+        size = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ,
+                                               b'1234'))
+    return size
+
+
 def run(q_prompt=False):
+    lines, columns = console_size()
+    q(r'\c %d %d' % (lines, columns))
     if len(sys.argv) > 1:
         try:
             q(r'\l %s' % sys.argv[1])
-        except kerr:
-            pass
+        except kerr as e:
+            print(e)
+            exit(1)
         else:
             del sys.argv[1]
     if q_prompt:
diff --git a/src/pyq/ptk.py b/src/pyq/ptk.py
index 89b9773..abadce6 100644
--- a/src/pyq/ptk.py
+++ b/src/pyq/ptk.py
@@ -93,9 +93,7 @@ def cmdloop(self, intro=None):
                       history=history, style=style, true_color=True,
                       on_exit='return-none', on_abort='return-none',
                       completer=QCompleter())
-        if line is None:
-            stop = True
-        elif line.strip() == r'\\':
+        if line is None or line.strip() == r'\\':
             raise SystemExit
         else:
             line = self.precmd(line)