docs

docs/synapse/glossary.rst

@@ -534,7 +534,7 @@ Form, Composite
 ---------------
 
 A category of form whose primary property is an ordered set of two or more comma-separated typed values. Examples
-include DNS A records (``inet:dns:a``) and web-based accounts (``inet:web:acct``).
+include DNS A records (``inet:dns:a``) and HTTP headers (``inet:http:header``).
 
 
 .. _gloss-form-extended:

docs/synapse/userguides/storm_adv_vars.rstorm

@@ -340,11 +340,11 @@ You can assign an explicit, unchanging value to a variable.
 
 You can assign the value of a particular node property (secondary or universal) to a variable.
 
-- **Secondary property:** Assign the ``:user`` property from an Internet-based account (``inet:web:acct``) to
-  the variable ``$user``:
+- **Secondary property:** Assign the ``:email`` property from an Internet-based account (``inet:service:account``) to
+  the variable ``$email``:
 
-.. storm-pre:: [inet:web:acct=(twitter.com,hacks4cats) :[email protected]]
-.. storm-cli:: inet:web:acct=(twitter.com,hacks4cats) $user=:user $lib.print($user)
+.. storm-pre:: [inet:service:account=(twitter.com,hacks4cats) :[email protected]]
+.. storm-cli:: inet:service:account=(twitter.com,hacks4cats) $email=:email $lib.print($email)
 
 
 - **Universal property:** Assign the ``.seen`` universal property from a DNS A node to the variable ``$time``:

docs/synapse/userguides/storm_ref_type_specific.rstorm

@@ -1421,10 +1421,10 @@ Lift all organizations whose name starts with the word "Acme ":
 
 .. storm-cli:: ou:org:name^='acme '
 
-Filter a set of Internet accounts to those with usernames starting with 'matrix':
+Filter a set of service accounts to those with usernames starting with 'matrix':
 
-.. storm-pre:: [ inet:web:acct=(twitter.com,matrixmaster) inet:web:acct=(twitter.com,matrixneo) ]
-.. storm-cli:: inet:web:acct:site=twitter.com +:user^=matrix
+.. storm-pre:: [ (inet:service:account=* :user=matrixmaster) (inet:service:account=* :user=matrixneo) ]
+.. storm-cli:: inet:service:account +:user^=matrix
 
 
 Strings and string-derived types can also be lifted or filtered using the regular expression extended comparator