source: change menu structure "other types" -> "devices" for clarity

source/interfaces.rst

@@ -16,12 +16,12 @@ All traffic flowing through your appliance is using (virtual) interfaces, this i
    :titlesonly:
 
    manual/interfaces
+   manual/other-interfaces
    manual/interfaces_overview
    manual/interfaces_settings
    manual/neighbors
    manual/firewall_vip
    manual/wireless
-   manual/other-interfaces
    manual/ipv6
    manual/diagnostics_interfaces
    manual/logging_interfaces

source/manual/how-tos/dynamic_routing_ospf.rst

@@ -421,9 +421,9 @@ Follow the steps as the `previous setup guide </manual/how-tos/dynamic_routing_o
 
    .. group-tab:: Step 1
 
-      #. :menuselection:`Interfaces --> Other Types --> Loopback`: Create two loopback interfaces on each firewall, use the network diagram for reference.
+      #. :menuselection:`Interfaces --> Devices --> Loopback`: Create two loopback interfaces on each firewall, use the network diagram for reference.
       #. :menuselection:`VPN --> IPsec --> Connections`: Create two policy based IPsec tunnels that each connect a pair of loopback interfaces as children, e.g., ``10.2.2.1/32`` with ``10.2.2.2/32``.
-      #. :menuselection:`Interfaces --> Other Types --> GRE`: Create two GRE tunnels on each firewall that each use a loopback interface of the other side as `Remote address`. The tunnel local and remote address can be referenced from the network diagram.
+      #. :menuselection:`Interfaces --> Devices --> GRE`: Create two GRE tunnels on each firewall that each use a loopback interface of the other side as `Remote address`. The tunnel local and remote address can be referenced from the network diagram.
 
       .. Note::
 

source/manual/how-tos/ipv6_tunnelbroker.rst

@@ -41,7 +41,7 @@ Step 1 - Add GIF tunnel
 -----------------------
 
 To configure OPNsense start with adding a new gif interface.
-Go to :menuselection:`Interfaces --> Other Types --> GIF` and click on **Add** in the upper tight corner
+Go to :menuselection:`Interfaces --> Devices --> GIF` and click on **Add** in the upper tight corner
 of the form.
 
 Use the following settings and copy in the IPv4&6 addresses from your TunnelBroker's UI.

source/manual/how-tos/lan_bridge.rst

@@ -21,7 +21,7 @@ It's a good idea to add the extra NIC interfaces ( OPTx ) during installation.
 
 **Step Two**
 -----------------
-Create the bridge itself. Select :menuselection:`Interfaces --> Other Types --> Bridge` and ADD a new bridge. Select
+Create the bridge itself. Select :menuselection:`Interfaces --> Devices --> Bridge` and ADD a new bridge. Select
 from the member interfaces the unused interfaces you wish to add to the bridge, OPT2,OPT3 etc.
 
 .. image:: images/lan_bridge_1.png
@@ -59,7 +59,7 @@ select it and hit the '+' button to add an assignment, then click Save.
 
 **Step Five**
 -----------------
-Select :menuselection:`Interfaces --> Other Types --> Bridge` and add the interface created in Step Four to the bridge
+Select :menuselection:`Interfaces --> Devices --> Bridge` and add the interface created in Step Four to the bridge
 and Save, remember to check the new interface and ensure it is enabled as in Step Two.
 
 .. image:: images/lan_bridge_4.png
@@ -88,4 +88,4 @@ Once complete, the :menuselection:`Interface --> Assignments` page should look s
 	:width: 100%
 
 
-Now reboot, when the system restores you should have a fully functional bridge interface.
+Now reboot, when the system restores you should have a fully functional bridge interface.

source/manual/how-tos/orange_fr_fttp.rst

@@ -14,7 +14,7 @@ The guide deals with just the internet connection. Setting up of TV or Phone is
 **Getting ready to make the connection**
 ----------------------------------------
 
-Orange requires that the WAN is configured over VLAN 832. So the first step is to set up the VLAN on the intended WAN nic as shown below :menuselection:`Interfaces --> Other Types --> VLAN`
+Orange requires that the WAN is configured over VLAN 832. So the first step is to set up the VLAN on the intended WAN nic as shown below :menuselection:`Interfaces --> Devices --> VLAN`
 
 .. image:: images/OF_image0.png
 	:width: 100%

source/manual/how-tos/transparent_bridge.rst

@@ -82,7 +82,7 @@ And disable filtering on member interfaces by changing
 --------------------
 
 Create a bridge of LAN and WAN, go to
-:menuselection:`Interfaces --> Other Types --> Bridge`. Add Select LAN and WAN.
+:menuselection:`Interfaces --> Devices --> Bridge`. Add Select LAN and WAN.
 
 |Filtering Bridge Step 3a.png|
 

source/manual/how-tos/vlan_and_lagg.rst

@@ -118,7 +118,7 @@ See the section on `LAGG </manual/other-interfaces.html#lagg>`_ for more details
     the assignment if necessary.
 
 
-- | Go to :menuselection:`Interfaces --> Other Types --> LAGG` and add a new entry:
+- | Go to :menuselection:`Interfaces --> Devices --> LAGG` and add a new entry:
 
 =============================  ================================================================
 **Option**                     **Value**
@@ -144,7 +144,7 @@ See the section on `VLAN </manual/other-interfaces.html#vlan>`_ for more details
 In our example setup we require tagged VLAN 5 (LAN), 20 (DMZ) and 33 (GUEST), and no untagged VLAN.
 If you skipped Step 1, create the VLAN directly on a physical interface like ``igc0``.
 
-- | Go to :menuselection:`Interfaces --> Other Types --> VLAN` and add new entries:
+- | Go to :menuselection:`Interfaces --> Devices --> VLAN` and add new entries:
 
 =============================  ===============  ===============  ===============
 **Option**                     **LAN**          **DMZ**          **GUEST**

source/manual/how-tos/vxlan_bridge.rst

@@ -57,7 +57,7 @@ Configuration
 1. Loopback Interface Setup
 ----------------------------
 
-- | Go to :menuselection:`Interfaces --> Other Types --> Loopback` and add ``lo1`` on both `Sites`
+- | Go to :menuselection:`Interfaces --> Devices --> Loopback` and add ``lo1`` on both `Sites`
 - | Go to :menuselection:`Interfaces --> Assignments` and assign ``lo1``
 - | Enable ``lo1`` and set a static IPv4 configuration:
 
@@ -96,7 +96,7 @@ The tunnel should now route traffic between the two loopback interfaces:
 3. VXLAN Interface
 ----------------------------
 
-- | Go to :menuselection:`Interfaces --> Other Types --> VXLAN` and create ``vxlan1`` interfaces:
+- | Go to :menuselection:`Interfaces --> Devices --> VXLAN` and create ``vxlan1`` interfaces:
 
 ===============  ================  ================
 **Option**       **Site A**        **Site B**
@@ -120,7 +120,7 @@ Device           None              None
 
 
 - | Remove the IP configuration from ``LAN``, it will be moved to ``bridge0``
-- | Go to :menuselection:`Interfaces --> Other Types --> Bridge` and create ``bridge0`` interfaces:
+- | Go to :menuselection:`Interfaces --> Devices --> Bridge` and create ``bridge0`` interfaces:
 
 ==================  =====================  =====================
 **Option**          **Site A**             **Site B**

source/manual/other-interfaces.rst

@@ -1,9 +1,9 @@
 ================
-Other Types
+Devices
 ================
 
 Besides wired, wireless and VPN interfaces, there are also some other, virtual interfaces, as well as some
-miscellaneous interface-related. These options can be found under :menuselection:`Interfaces --> Other types`.
+miscellaneous interface-related. These options can be found under :menuselection:`Interfaces --> Devices`.
 This document briefly explains these options.
 
 ------
@@ -89,7 +89,7 @@ IPv6 tunnel of Hurricane Electric (he.net).
     In :doc:`/manual/how-tos/ipv6_tunnelbroker` you can find information on how to setup a tunnel using Hurricane Electric
 
 
-As with all tunnel types, the most important settings relate to how both ends connect and which addressing will be used to
+As with all tunnel devices, the most important settings relate to how both ends connect and which addressing will be used to
 route traffic over the tunnel. The rest of the settings usually are best left to their defaults.
 
 ==================================  ==================================================================================================
@@ -221,8 +221,8 @@ Read `LAGG Setup </manual/how-tos/vlan_and_lagg.html>`_ for an example configura
 Loopback
 --------------
 
-Loopbacks are logical virtual interfaces which emulate real interfaces and can be used for different setup scenario's,
-which require always-on interfaces. Below you will find some scenario's for which these types of interfaces are used.
+Loopbacks are logical virtual interfaces which emulate real interfaces and can be used for different setup scenarios,
+which require always-on interfaces. Below you will find some scenario's for which these devices are used.
 
 *   Administrative access to services on your machine, which can bind to an address configured on top of the loopback.
 *   Using loopback addresses as router IDs for OSPF or BGP, which helps to identify your nodes and eases administration
@@ -234,7 +234,7 @@ VLAN
 VLANs (Virtual LANs) can be used to segment a single physical network into multiple virtual networks. This can be
 done for QoS purposes, among other things. For this reason, most ISP-issued IPTV devices utilize VLANs.
 
-The following settings are available for these interface types:
+The following settings are available for these devices:
 
 ==================================  =======================================================================================================
 Name                                Description

source/manual/settingsmenu.rst

@@ -42,7 +42,7 @@ that don't support binding for these services.
 
 .. Tip::
     In case (**for any service**) one would like to prevent binding on all interfaces, it is possible to add a
-    loopback interface (:menuselection:`Interfaces->Other Types->Loopback`), assign an ip address and bind to that.
+    loopback interface (:menuselection:`Interfaces --> Devices --> Loopback`), assign an ip address and bind to that.
 
     If traffic is being routed through the firewall, the "loopback ip" (some private addres, not in the loopback range)
     should be directly accessible from the network behind it. For example use an address like :code:`192.192.192.192/32`