diff --git a/cli/documentation/en_US/address-space/active b/cli/documentation/en_US/address-space/active
new file mode 100755
index 0000000..aba5aea
--- /dev/null
+++ b/cli/documentation/en_US/address-space/active
@@ -0,0 +1,2 @@
+Set the address-space active. If an address-space is inactive the
+controller will not use it or its rules.
diff --git a/cli/documentation/en_US/address-space/active-example b/cli/documentation/en_US/address-space/active-example
new file mode 100755
index 0000000..88b1a43
--- /dev/null
+++ b/cli/documentation/en_US/address-space/active-example
@@ -0,0 +1,6 @@
+active
+  Within an address-space config sub-mode,
+  set this address-space as active
+
+no active
+  Deactivate the currently-configured address space
diff --git a/cli/documentation/en_US/address-space/address-space b/cli/documentation/en_US/address-space/address-space
new file mode 100755
index 0000000..f4e3fcb
--- /dev/null
+++ b/cli/documentation/en_US/address-space/address-space
@@ -0,0 +1,4 @@
+Set up or tear down address space definitions.
+
+Specifying an address space by name enters the address-space
+configuration sub-mode.
diff --git a/cli/documentation/en_US/address-space/address-space-example b/cli/documentation/en_US/address-space/address-space-example
new file mode 100755
index 0000000..1ee811c
--- /dev/null
+++ b/cli/documentation/en_US/address-space/address-space-example
@@ -0,0 +1,5 @@
+addres-space MY-ADDRESS
+  Define a new address space, and enter its configuration submode
+
+no address-space MY-ADDRESS
+  Delete an address space by name
diff --git a/cli/documentation/en_US/address-space/description b/cli/documentation/en_US/address-space/description
new file mode 100755
index 0000000..f3d87a7
--- /dev/null
+++ b/cli/documentation/en_US/address-space/description
@@ -0,0 +1 @@
+A user provided textual description for this address-space.
diff --git a/cli/documentation/en_US/address-space/description-example b/cli/documentation/en_US/address-space/description-example
new file mode 100755
index 0000000..ea2b5e8
--- /dev/null
+++ b/cli/documentation/en_US/address-space/description-example
@@ -0,0 +1,2 @@
+description "THIS IS MY ADDRESS-SPACE"
+  Associate a textual description with this address-space
diff --git a/cli/documentation/en_US/address-space/id-active b/cli/documentation/en_US/address-space/id-active
new file mode 100755
index 0000000..b01dcd8
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-active
@@ -0,0 +1 @@
+Configure this address space identifier rule as 'active'
\ No newline at end of file
diff --git a/cli/documentation/en_US/address-space/id-active-example b/cli/documentation/en_US/address-space/id-active-example
new file mode 100755
index 0000000..b688fda
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-active-example
@@ -0,0 +1,5 @@
+active
+  Configure this address space identifier rule as active
+
+no active
+  Deactivate this address space identifier rule
diff --git a/cli/documentation/en_US/address-space/id-description b/cli/documentation/en_US/address-space/id-description
new file mode 100755
index 0000000..3f10bfa
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-description
@@ -0,0 +1 @@
+A user provided textual description for this identifier-rule.
diff --git a/cli/documentation/en_US/address-space/id-description-example b/cli/documentation/en_US/address-space/id-description-example
new file mode 100755
index 0000000..fd923de
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-description-example
@@ -0,0 +1,2 @@
+description "This is rule42"
+  Provide a description for the currently-defined address-space identifier rule
diff --git a/cli/documentation/en_US/address-space/id-priority b/cli/documentation/en_US/address-space/id-priority
new file mode 100755
index 0000000..234e07e
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-priority
@@ -0,0 +1,3 @@
+The prirority of this identifier-rule. Higher numeric values represent
+higher priority. The highest priority identifier-rule that matches a
+given packet will be choosen. 
diff --git a/cli/documentation/en_US/address-space/id-priority-example b/cli/documentation/en_US/address-space/id-priority-example
new file mode 100755
index 0000000..91da1f6
--- /dev/null
+++ b/cli/documentation/en_US/address-space/id-priority-example
@@ -0,0 +1,2 @@
+priority 100
+  Set the priority for the currently-defined address-space identifier rule
diff --git a/cli/documentation/en_US/address-space/identifier b/cli/documentation/en_US/address-space/identifier
new file mode 100755
index 0000000..1637896
--- /dev/null
+++ b/cli/documentation/en_US/address-space/identifier
@@ -0,0 +1,3 @@
+This is the name of the address-space.  The address-space name "default"
+represents the default address space that will be used if no other
+address-space matches.
diff --git a/cli/documentation/en_US/address-space/identifier-rule b/cli/documentation/en_US/address-space/identifier-rule
new file mode 100755
index 0000000..36d5180
--- /dev/null
+++ b/cli/documentation/en_US/address-space/identifier-rule
@@ -0,0 +1,2 @@
+Set an address-space identifier rule and enter submode. Devices are
+assigned into address-spaces based on identifier-rules. 
diff --git a/cli/documentation/en_US/address-space/identifier-rule-example b/cli/documentation/en_US/address-space/identifier-rule-example
new file mode 100755
index 0000000..b813033
--- /dev/null
+++ b/cli/documentation/en_US/address-space/identifier-rule-example
@@ -0,0 +1,7 @@
+identifier-rule rule42
+  Define a new identifier rule for this address-space definition,
+  and enter the identifier-rule submode
+
+no identifier-rule rule42
+  Delete an identifier rule associated with the
+  currently-define address-space
diff --git a/cli/documentation/en_US/address-space/match b/cli/documentation/en_US/address-space/match
new file mode 100755
index 0000000..9e73720
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match
@@ -0,0 +1,2 @@
+Configure a match for this identifier rule. If multiple matches are
+configured they will be logically AND'ed.
diff --git a/cli/documentation/en_US/address-space/match-switch b/cli/documentation/en_US/address-space/match-switch
new file mode 100755
index 0000000..e805cc0
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-switch
@@ -0,0 +1,3 @@
+Associate a switch or set of switch interfaces with this identifier
+rule. Devices present on the specified switch/interfaces will be
+matched. 
diff --git a/cli/documentation/en_US/address-space/match-switch-example b/cli/documentation/en_US/address-space/match-switch-example
new file mode 100755
index 0000000..9a3d4b1
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-switch-example
@@ -0,0 +1,12 @@
+match switch 00:00:11:22:33:44:55:66
+    Matches all interfaces on the switch with this DPID.
+
+match switch 00:00:11:22:33:44:55:66 Ethernet1
+    Matches interface Ethernet1 on the specified switch.
+
+match switch 00:00:11:22:33:44:55:66 Ethernet1,Ethernet5-10,port2
+    Matches interfaces Ethernet1, Ethernet5, Ethernet6, ... Ethernet10,
+	and port2 on the specified switch.
+
+match switch ToR-1-1 
+    Matches the switch with the alias 'ToR-1-1'
diff --git a/cli/documentation/en_US/address-space/match-switch-ports b/cli/documentation/en_US/address-space/match-switch-ports
new file mode 100755
index 0000000..bb28a43
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-switch-ports
@@ -0,0 +1 @@
+Restrict the match to a switch interface or list/range of switch interfaces
diff --git a/cli/documentation/en_US/address-space/match-tag b/cli/documentation/en_US/address-space/match-tag
new file mode 100755
index 0000000..5417f7e
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-tag
@@ -0,0 +1,2 @@
+Associate a tag or list of tags with this identifier-rule. If a list of
+tags is given *all* tags need to match.
diff --git a/cli/documentation/en_US/address-space/match-tag-example b/cli/documentation/en_US/address-space/match-tag-example
new file mode 100755
index 0000000..43b4f77
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-tag-example
@@ -0,0 +1,5 @@
+match tags org.sdnplatform.tenant=CustomerA
+    Matches devices that match the given tag.
+
+match tags org.sdnplatform.tenant=CustomerA,com.example.type=router
+    Matches devices that match *all* of the given tags.
diff --git a/cli/documentation/en_US/address-space/match-vlan b/cli/documentation/en_US/address-space/match-vlan
new file mode 100755
index 0000000..181d4e9
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-vlan
@@ -0,0 +1,2 @@
+Associate VLANs with identifier-rule. In this software version the
+specified VLAN must be equal to value specified for 'vlan-tag-on-egress'
diff --git a/cli/documentation/en_US/address-space/match-vlan-example b/cli/documentation/en_US/address-space/match-vlan-example
new file mode 100755
index 0000000..a8d4252
--- /dev/null
+++ b/cli/documentation/en_US/address-space/match-vlan-example
@@ -0,0 +1,8 @@
+match vlans 1001
+  Associate one or more VLAN IDs with this identifer rule
+
+no match vlans 1001
+  Remove a VLAN ID association from this identifier rule
+
+no match vlans
+  Remove all VLAN ID associations from this identifier rule
diff --git a/cli/documentation/en_US/address-space/origin b/cli/documentation/en_US/address-space/origin
new file mode 100755
index 0000000..88a8f3a
--- /dev/null
+++ b/cli/documentation/en_US/address-space/origin
@@ -0,0 +1 @@
+Describe the origin of an address space
diff --git a/cli/documentation/en_US/address-space/origin-example b/cli/documentation/en_US/address-space/origin-example
new file mode 100755
index 0000000..63707cc
--- /dev/null
+++ b/cli/documentation/en_US/address-space/origin-example
@@ -0,0 +1,5 @@
+origin rest
+  Note that this address-space was configured via REST
+
+no origin rest
+  Remove the origin notation for this address-space
diff --git a/cli/documentation/en_US/address-space/priority b/cli/documentation/en_US/address-space/priority
new file mode 100755
index 0000000..b7fe9bc
--- /dev/null
+++ b/cli/documentation/en_US/address-space/priority
@@ -0,0 +1,4 @@
+The prirority of this address-space. Higher numeric values represent
+higher priority. All identifier-rules of the highest priority
+address-space will be evaluated before any rules of other
+address-spaces.
diff --git a/cli/documentation/en_US/address-space/priority-example b/cli/documentation/en_US/address-space/priority-example
new file mode 100755
index 0000000..cad7da5
--- /dev/null
+++ b/cli/documentation/en_US/address-space/priority-example
@@ -0,0 +1,6 @@
+priority 100
+  Set the priority of this currently-defined address-space
+
+no priority 100
+  Remove the previous priority declaration,
+  and reset this address-space's priority to the default value
diff --git a/cli/documentation/en_US/address-space/show-id b/cli/documentation/en_US/address-space/show-id
new file mode 100755
index 0000000..95814d3
--- /dev/null
+++ b/cli/documentation/en_US/address-space/show-id
@@ -0,0 +1,4 @@
+This 'show address-space' command variation is used to identify a
+specific address-space (the 'all' token provides display for every
+address-spaceJ), to describe particular operational or configured
+details.
diff --git a/cli/documentation/en_US/address-space/show-id-rules b/cli/documentation/en_US/address-space/show-id-rules
new file mode 100755
index 0000000..61e04f6
--- /dev/null
+++ b/cli/documentation/en_US/address-space/show-id-rules
@@ -0,0 +1,4 @@
+The 'identifier-rules' keyword requests the display of the configured
+identifier-rules for the named adderss-space.  The address-space
+identifier-rules describe the membership rules associated with an
+address-space.
diff --git a/cli/documentation/en_US/address-space/vlan-tag-on-egress b/cli/documentation/en_US/address-space/vlan-tag-on-egress
new file mode 100755
index 0000000..771b901
--- /dev/null
+++ b/cli/documentation/en_US/address-space/vlan-tag-on-egress
@@ -0,0 +1,3 @@
+Associates a VLAN with this address-space. This VLAN is used for
+internal disambiguation and for tagging packets that egress to other
+networks (according to identifier-rule configuration).
diff --git a/cli/documentation/en_US/address-space/vlan-tag-on-egress-example b/cli/documentation/en_US/address-space/vlan-tag-on-egress-example
new file mode 100755
index 0000000..c22ec03
--- /dev/null
+++ b/cli/documentation/en_US/address-space/vlan-tag-on-egress-example
@@ -0,0 +1,4 @@
+vlan-tag-on-egress 42
+  Associate a VLAN tag with this address-space.
+  Each address-space must have an associated VLAN, else this address-space
+  will be ignored by the controller