recog 2.3.8 → 2.3.9

data/xml/mdns_device-info_txt.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints matches="mdns.device-info.txt" protocol="mdns" database_type="util.os">
   <!--
     Fingerprint definitions that are matched against the string values in the
@@ -7,11 +7,13 @@
     to the domain name for a server to respond with the record:
     e.g. 'host-name._device-info._tcp.local'.
   -->
+
   <!--
      OS X versions:
      The number specified after osxvers= is equivalent to the major
      version of OS X plus 4. E.g. osxvers=13 means OS X 10.9
    -->
+
   <fingerprint pattern="^osxvers=19">
     <description>OS X 10.15 (Catalina)</description>
     <example>osxvers=19</example>
@@ -21,6 +23,7 @@
     <param pos="0" name="os.version" value="10.15"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.15"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=18">
     <description>OS X 10.14 (Mojave)</description>
     <example>osxvers=18</example>
@@ -30,6 +33,7 @@
     <param pos="0" name="os.version" value="10.14"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.14"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=17">
     <description>OS X 10.13 (High Sierra)</description>
     <example>osxvers=17</example>
@@ -39,6 +43,7 @@
     <param pos="0" name="os.version" value="10.13"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.13"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=16">
     <description>OS X 10.12 (Sierra)</description>
     <example>osxvers=16</example>
@@ -48,6 +53,7 @@
     <param pos="0" name="os.version" value="10.12"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.12"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=15">
     <description>OS X 10.11 (El Capitan)</description>
     <example>osxvers=15</example>
@@ -57,6 +63,7 @@
     <param pos="0" name="os.version" value="10.11"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.11"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=14">
     <description>OS X 10.10 (Yosemite)</description>
     <example>osxvers=14</example>
@@ -66,6 +73,7 @@
     <param pos="0" name="os.version" value="10.10"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.10"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=13">
     <description>OS X 10.9 (Mavericks)</description>
     <example>osxvers=13</example>
@@ -75,6 +83,7 @@
     <param pos="0" name="os.version" value="10.9"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.9"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=12">
     <description>OS X 10.8 (Mountain Lion)</description>
     <example>osxvers=12</example>
@@ -84,6 +93,7 @@
     <param pos="0" name="os.version" value="10.8"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.8"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=11">
     <description>Mac OS X 10.7 (Lion)</description>
     <example>osxvers=11</example>
@@ -93,6 +103,7 @@
     <param pos="0" name="os.version" value="10.7"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.7"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=10">
     <description>Mac OS X 10.6 (Snow Leopard)</description>
     <example>osxvers=10</example>
@@ -102,6 +113,7 @@
     <param pos="0" name="os.version" value="10.6"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.6"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=9">
     <description>Mac OS X 10.5 (Leopard)</description>
     <example>osxvers=9</example>
@@ -111,6 +123,7 @@
     <param pos="0" name="os.version" value="10.5"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.5"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=8">
     <description>Mac OS X 10.4 (Tiger)</description>
     <example>osxvers=8</example>
@@ -120,6 +133,7 @@
     <param pos="0" name="os.version" value="10.4"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.4"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=7">
     <description>Mac OS X 10.3 (Panther)</description>
     <example>osxvers=7</example>
@@ -129,6 +143,7 @@
     <param pos="0" name="os.version" value="10.3"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.3"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=6">
     <description>Mac OS X 10.2 (Jaguar)</description>
     <example>osxvers=6</example>
@@ -138,6 +153,7 @@
     <param pos="0" name="os.version" value="10.2"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.2"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=5">
     <description>Mac OS X 10.1 (Puma)</description>
     <example>osxvers=5</example>
@@ -147,6 +163,7 @@
     <param pos="0" name="os.version" value="10.1"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.1"/>
   </fingerprint>
+
   <fingerprint pattern="^osxvers=4">
     <description>Mac OS X 10.0 (Cheetah)</description>
     <example>osxvers=4</example>
@@ -156,8 +173,11 @@
     <param pos="0" name="os.version" value="10.0"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:10.0"/>
   </fingerprint>
+
   <!-- AirPort Express -->
+
   <!-- TODO: Break this down into specific models and generations -->
+
   <fingerprint pattern="^model=AirPort4(?:,\d+)?$">
     <description>AirPort Express</description>
     <example>model=AirPort4</example>
@@ -173,8 +193,11 @@
     <param pos="0" name="hw.device" value="WAP"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:airport_express:-"/>
   </fingerprint>
+
   <!-- AirPort Extreme -->
+
   <!-- TODO: Break this down into specific models and generations -->
+
   <fingerprint pattern="^model=AirPort5?(?:,\d+)?$">
     <description>AirPort Extreme</description>
     <example>model=AirPort</example>
@@ -191,8 +214,11 @@
     <param pos="0" name="hw.device" value="WAP"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:airport_extreme:-"/>
   </fingerprint>
+
   <!-- TimeCapsule aka AirPort 6 -->
+
   <!-- TODO: Break this down into specific models and generations -->
+
   <fingerprint pattern="^model=(?:AirPort6|TimeCapsule).*$">
     <description>Time Capsule</description>
     <example>model=AirPort6</example>
@@ -209,7 +235,9 @@
     <param pos="0" name="hw.product" value="Time Capsule"/>
     <param pos="0" name="hw.device" value="WAP"/>
   </fingerprint>
+
   <!-- MacBookPro - Reference for the following: https://support.apple.com/en-us/HT201300 -->
+
   <fingerprint pattern="^model=MacBookPro15,4$">
     <description>MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro15,4</example>
@@ -222,6 +250,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2019, Two Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro15,3$">
     <description>MacBook Pro (15-inch, 2019)</description>
     <example>model=MacBookPro15,3</example>
@@ -234,6 +263,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2019)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro15,2$">
     <description>MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro15,2</example>
@@ -246,6 +276,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2018, Four Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro15,1$">
     <description>MacBook Pro (15-inch, 2018)</description>
     <example>model=MacBookPro15,1</example>
@@ -258,6 +289,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2018)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro14,3$">
     <description>MacBook Pro (15-inch, 2017)</description>
     <example>model=MacBookPro14,3</example>
@@ -270,6 +302,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro14,2$">
     <description>MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro14,2</example>
@@ -282,6 +315,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2017, Four Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro14,1$">
     <description>MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro14,1</example>
@@ -294,6 +328,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2017, Two Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro13,3$">
     <description>MacBook Pro (15-inch, 2016)</description>
     <example>model=MacBookPro13,3</example>
@@ -306,6 +341,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, 2016)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro13,2$">
     <description>MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)</description>
     <example>model=MacBookPro13,2</example>
@@ -318,6 +354,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2016, Four Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro13,1$">
     <description>MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)</description>
     <example>model=MacBookPro13,1</example>
@@ -330,6 +367,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, 2016, Two Thunderbolt 3 ports)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro12,1$">
     <description>MacBook Pro (Retina, 13-inch, Early 2015)</description>
     <example>model=MacBookPro12,1</example>
@@ -342,6 +380,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Early 2015)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro11,4$">
     <description>MacBook Pro (Retina, 15-inch, Mid 2015)</description>
     <example>model=MacBookPro11,4</example>
@@ -354,6 +393,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Mid 2015)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro11,3$">
     <description>MacBook Pro (Retina, 15-inch, Late 2013) - rev 2</description>
     <example>model=MacBookPro11,3</example>
@@ -366,6 +406,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Late 2013)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro11,2$">
     <description>MacBook Pro (Retina, 15-inch, Late 2013)</description>
     <example>model=MacBookPro11,2</example>
@@ -378,6 +419,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Late 2013)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro11,1$">
     <description>MacBook Pro (Retina, 13-inch, Late 2013)</description>
     <example>model=MacBookPro11,1</example>
@@ -390,6 +432,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Late 2013)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro10,2$">
     <description>MacBook Pro (Retina, 13-inch, Early 2013)</description>
     <example>model=MacBookPro10,2</example>
@@ -402,6 +445,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 13-inch, Early 2013)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro10,1$">
     <description>MacBook Pro (Retina, 15-inch, Early 2013)</description>
     <example>model=MacBookPro10,1</example>
@@ -414,6 +458,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (Retina, 15-inch, Early 2013)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro9,2$">
     <description>MacBook Pro (13-inch, Mid 2012)</description>
     <example>model=MacBookPro9,2</example>
@@ -426,6 +471,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, Mid 2012)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro8,3$">
     <description>MacBook Pro (17-inch, Late 2011)</description>
     <example>model=MacBookPro8,3</example>
@@ -438,6 +484,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (17-inch, Late 2011)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro8,2$">
     <description>MacBook Pro (15-inch, Late 2011)</description>
     <example>model=MacBookPro8,2</example>
@@ -450,6 +497,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, Late 2011)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro8,1$">
     <description>MacBook Pro (13-inch, Late 2011)</description>
     <example>model=MacBookPro8,1</example>
@@ -462,6 +510,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, Late 2011)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro7,1$">
     <description>MacBook Pro (13-inch, Mid 2010)</description>
     <example>model=MacBookPro7,1</example>
@@ -474,6 +523,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro6,2$">
     <description>MacBook Pro (15-inch, Mid 2010)</description>
     <example>model=MacBookPro6,2</example>
@@ -486,6 +536,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro6,1$">
     <description>MacBook Pro (17-inch, Mid 2010)</description>
     <example>model=MacBookPro6,1</example>
@@ -498,6 +549,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (17-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro5,5$">
     <description>MacBook Pro (13-inch, Mid 2009)</description>
     <example>model=MacBookPro5,5</example>
@@ -510,6 +562,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (13-inch, Mid 2009)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro5,3$">
     <description>MacBook Pro (15-inch, Mid 2009)</description>
     <example>model=MacBookPro5,3</example>
@@ -522,6 +575,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, Mid 2009)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro5,2$">
     <description>MacBook Pro (17-inch, Mid 2009)</description>
     <example>model=MacBookPro5,2</example>
@@ -534,6 +588,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (17-inch, Mid 2009)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro5,1$">
     <description>MacBook Pro (15-inch, Late 2008)</description>
     <example>model=MacBookPro5,1</example>
@@ -546,6 +601,7 @@
     <param pos="0" name="hw.product" value="MacBook Pro (15-inch, Late 2008)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro4,1$">
     <description>MacBook Pro (17-inch, Early 2008)</description>
     <example>model=MacBookPro4,1</example>
@@ -558,7 +614,9 @@
     <param pos="0" name="hw.product" value="MacBook Pro (17-inch, Early 2008)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <!-- MacBook - Reference for the following: https://support.apple.com/en-us/HT201608 -->
+
   <fingerprint pattern="^model=MacBook10,1$">
     <description>MacBook (Retina, 12-inch, 2017)</description>
     <example>model=MacBook10,1</example>
@@ -571,6 +629,7 @@
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBook9,1$">
     <description>MacBook (Retina, 12-inch, Early 2016)</description>
     <example>model=MacBook9,1</example>
@@ -583,6 +642,7 @@
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, Early 2016)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBook8,1$">
     <description>MacBook (Retina, 12-inch, Early 2015)</description>
     <example>model=MacBook8,1</example>
@@ -595,6 +655,7 @@
     <param pos="0" name="hw.product" value="MacBook (Retina, 12-inch, Early 2015)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBook7,1$">
     <description>MacBook (13-inch, Mid 2010)</description>
     <example>model=MacBook7,1</example>
@@ -607,7 +668,9 @@
     <param pos="0" name="hw.product" value="MacBook (13-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <!-- MacBookAir - Reference for the following: https://support.apple.com/en-us/HT201862 -->
+
   <fingerprint pattern="^model=MacBookAir8,2$">
     <description>MacBook Air (Retina, 13-inch, 2019)</description>
     <example>model=MacBookAir8,2</example>
@@ -620,6 +683,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (Retina, 13-inch, 2019)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir8,1$">
     <description>MacBook Air (Retina, 13-inch, 2018)</description>
     <example>model=MacBookAir8,1</example>
@@ -632,6 +696,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (Retina, 13-inch, 2018)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir7,2$">
     <description>MacBook Air (13-inch, 2017)</description>
     <example>model=MacBookAir7,2</example>
@@ -644,6 +709,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (13-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir7,1$">
     <description>MacBook Air (11-inch, Early 2015)</description>
     <example>model=MacBookAir7,1</example>
@@ -656,6 +722,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (11-inch, Early 2015)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir6,2$">
     <description>MacBook Air (13-inch, Early 2014)</description>
     <example>model=MacBookAir6,2</example>
@@ -668,6 +735,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (13-inch, Early 2014)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir6,1$">
     <description>MacBook Air (11-inch, Early 2014)</description>
     <example>model=MacBookAir6,1</example>
@@ -680,6 +748,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (11-inch, Early 2014)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir5,2$">
     <description>MacBook Air (13-inch, Mid 2012)</description>
     <example>model=MacBookAir5,2</example>
@@ -692,6 +761,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (13-inch, Mid 2012)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir5,1$">
     <description>MacBook Air (11-inch, Mid 2012)</description>
     <example>model=MacBookAir5,1</example>
@@ -704,6 +774,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (11-inch, Mid 2012)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir4,2$">
     <description>MacBook Air (13-inch, Mid 2011)</description>
     <example>model=MacBookAir4,2</example>
@@ -716,6 +787,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (13-inch, Mid 2011)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir4,1$">
     <description>MacBook Air (11-inch, Mid 2011)</description>
     <example>model=MacBookAir4,1</example>
@@ -728,6 +800,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (11-inch, Mid 2011)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir3,2$">
     <description>MacBook Air (13-inch, Late 2010)</description>
     <example>model=MacBookAir3,2</example>
@@ -740,6 +813,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (13-inch, Late 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir3,1$">
     <description>MacBook Air (11-inch, Late 2010)</description>
     <example>model=MacBookAir3,1</example>
@@ -752,6 +826,7 @@
     <param pos="0" name="hw.product" value="MacBook Air (11-inch, Late 2010)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacBookAir2,1$">
     <description>MacBook Air (Mid 2009)</description>
     <example>model=MacBookAir2,1</example>
@@ -764,7 +839,9 @@
     <param pos="0" name="hw.product" value="MacBook Air (Mid 2009)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
   </fingerprint>
+
   <!-- MacMini - Reference for the following: https://support.apple.com/en-us/HT201894 -->
+
   <fingerprint pattern="^model=Macmini8,1$">
     <description>Mac mini (Late 2018)</description>
     <example>model=Macmini8,1</example>
@@ -777,6 +854,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Late 2018)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini7,1$">
     <description>Mac mini (Late 2014)</description>
     <example>model=Macmini7,1</example>
@@ -789,6 +867,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Late 2014)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini6,2$">
     <description>Mac mini (Late 2012) - rev 2</description>
     <example>model=Macmini6,2</example>
@@ -801,6 +880,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini6,1$">
     <description>Mac mini (Late 2012)</description>
     <example>model=Macmini6,1</example>
@@ -813,6 +893,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Late 2012)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini5,[12]$">
     <description>Mac mini (Mid 2011)</description>
     <example>model=Macmini5,1</example>
@@ -825,6 +906,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Mid 2011)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini4,1$">
     <description>Mac mini (Mid 2010)</description>
     <example>model=Macmini4,1</example>
@@ -837,6 +919,7 @@
     <param pos="0" name="hw.product" value="Mac mini (Mid 2010)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Macmini3,1$">
     <description>Mac mini (Late 2009)</description>
     <example>model=Macmini3,1</example>
@@ -849,7 +932,9 @@
     <param pos="0" name="hw.product" value="Mac mini (Late 2009)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- Listed at https://en.wikipedia.org/wiki/Mac_Mini#2nd_generation_(Intel-based,_2006-2009) -->
+
   <fingerprint pattern="^model=Macmini2,1$">
     <description>Mac mini (Mid 2007)</description>
     <example>model=Macmini2,1</example>
@@ -862,7 +947,9 @@
     <param pos="0" name="hw.product" value="Mac mini (Mid 2007)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- MacPro - Reference for the following: https://support.apple.com/en-us/HT202888 -->
+
   <fingerprint pattern="^model=MacPro7,1$">
     <description>Mac Pro (Late 2019)</description>
     <example>model=MacPro7,1</example>
@@ -875,6 +962,7 @@
     <param pos="0" name="hw.product" value="Mac Pro (Late 2019)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacPro6,1$">
     <description>Mac Pro (Late 2013)</description>
     <example>model=MacPro6,1</example>
@@ -887,6 +975,7 @@
     <param pos="0" name="hw.product" value="Mac Pro (Late 2013)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacPro5,1$">
     <description>Mac Pro (Mid 2012)</description>
     <example>model=MacPro5,1</example>
@@ -899,6 +988,7 @@
     <param pos="0" name="hw.product" value="Mac Pro (Mid 2012)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacPro4,1$">
     <description>Mac Pro (Early 2009)</description>
     <example>model=MacPro4,1</example>
@@ -911,7 +1001,9 @@
     <param pos="0" name="hw.product" value="Mac Pro (Early 2009)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- MacPro older models listed at https://en.wikipedia.org/wiki/Mac_Pro -->
+
   <fingerprint pattern="^model=MacPro3,1$">
     <description>Mac Pro (Early 2008)</description>
     <example>model=MacPro3,1</example>
@@ -924,6 +1016,7 @@
     <param pos="0" name="hw.product" value="Mac Pro (Early 2008)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=MacPro2,1$">
     <description>Mac Pro (Mid 2007)</description>
     <example>model=MacPro2,1</example>
@@ -936,7 +1029,9 @@
     <param pos="0" name="hw.product" value="Mac Pro (Mid 2007)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- MacPro with no model assumed to early 1,1 -->
+
   <fingerprint pattern="^model=MacPro(?:1,1)?$">
     <description>Mac Pro (Mid 2006)</description>
     <example>model=MacPro1,1</example>
@@ -950,7 +1045,9 @@
     <param pos="0" name="hw.product" value="Mac Pro (Mid 2006)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- XServe - Reference for the following: https://en.wikipedia.org/wiki/Xserve -->
+
   <fingerprint pattern="^model=Xserve3,1$">
     <description>Xserve (Early 2009)</description>
     <example>model=Xserve3,1</example>
@@ -962,6 +1059,7 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve (Early 2009)"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Xserve2,1$">
     <description>Xserve (Early 2008)</description>
     <example>model=Xserve2,1</example>
@@ -973,6 +1071,7 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve (Early 2008)"/>
   </fingerprint>
+
   <fingerprint pattern="^model=Xserve1,1$">
     <description>Xserve (Late 2006)</description>
     <example>model=Xserve1,1</example>
@@ -984,6 +1083,7 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve (Late 2006)"/>
   </fingerprint>
+
   <fingerprint pattern="^model=RackMac3,1$">
     <description>Xserve G5</description>
     <example>model=RackMac3,1</example>
@@ -995,6 +1095,7 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve G5"/>
   </fingerprint>
+
   <fingerprint pattern="^model=RackMac1,2$">
     <description>Xserve G4 (Slot Load)</description>
     <example>model=RackMac1,2</example>
@@ -1006,6 +1107,7 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve G4 (Slot Load)"/>
   </fingerprint>
+
   <fingerprint pattern="^model=RackMac1,1$">
     <description>Xserve G4</description>
     <example>model=RackMac1,1</example>
@@ -1017,7 +1119,9 @@
     <param pos="0" name="hw.family" value="Xserve"/>
     <param pos="0" name="hw.product" value="Xserve G4"/>
   </fingerprint>
+
   <!-- iMAC - Reference for the following: https://support.apple.com/en-us/HT201634 -->
+
   <fingerprint pattern="^model=iMac19,1$">
     <description>iMac (Retina 5K, 27-inch, 2019)</description>
     <example>model=iMac19,1</example>
@@ -1030,6 +1134,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 5K, 27-inch, 2019)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac19,2$">
     <description>iMac (Retina 4K, 21.5-inch, 2019)</description>
     <example>model=iMac19,2</example>
@@ -1042,6 +1147,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 4K, 21.5-inch, 2019)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMacPro1,1$">
     <description>iMac Pro (Retina 5K, Late 2017)</description>
     <example>model=iMacPro1,1</example>
@@ -1054,6 +1160,7 @@
     <param pos="0" name="hw.product" value="iMac Pro (Retina 5K, Late 2017)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac18,3$">
     <description>iMac (Retina 5K, 27-inch, 2017)</description>
     <example>model=iMac18,3</example>
@@ -1066,6 +1173,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 5K, 27-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac18,2$">
     <description>iMac (Retina 4K, 21.5-inch, 2017)</description>
     <example>model=iMac18,2</example>
@@ -1078,6 +1186,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 4K, 21.5-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac18,1$">
     <description>iMac (21.5-inch, 2017)</description>
     <example>model=iMac18,1</example>
@@ -1090,6 +1199,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, 2017)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac17,1$">
     <description>iMac (Retina 5K, 27-inch, Late 2015)</description>
     <example>model=iMac17,1</example>
@@ -1102,6 +1212,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 5K, 27-inch, Late 2015)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac16,2$">
     <description>iMac (Retina 4K, 21.5-inch, Late 2015)</description>
     <example>model=iMac16,2</example>
@@ -1114,6 +1225,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 4K, 21.5-inch, Late 2015)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac16,1$">
     <description>iMac (21.5-inch, Late 2015)</description>
     <example>model=iMac16,1</example>
@@ -1126,6 +1238,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Late 2015)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac15,1$">
     <description>iMac (Retina 5K, 27-inch, Mid 2015)</description>
     <example>model=iMac15,1</example>
@@ -1138,6 +1251,7 @@
     <param pos="0" name="hw.product" value="iMac (Retina 5K, 27-inch, Mid 2015)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac14,4$">
     <description>iMac (21.5-inch, Mid 2014)</description>
     <example>model=iMac14,4</example>
@@ -1150,6 +1264,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Mid 2014)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac14,2$">
     <description>iMac (27-inch, Late 2013)</description>
     <example>model=iMac14,2</example>
@@ -1162,6 +1277,7 @@
     <param pos="0" name="hw.product" value="iMac (27-inch, Late 2013)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac14,1$">
     <description>iMac (21.5-inch, Late 2013)</description>
     <example>model=iMac14,1</example>
@@ -1174,6 +1290,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Late 2013)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac13,2$">
     <description>iMac (27-inch, Late 2012)</description>
     <example>model=iMac13,2</example>
@@ -1186,6 +1303,7 @@
     <param pos="0" name="hw.product" value="iMac (27-inch, Late 2012)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac13,1$">
     <description>iMac (21.5-inch, Late 2012)</description>
     <example>model=iMac13,1</example>
@@ -1198,6 +1316,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Late 2012)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac12,2$">
     <description>iMac (27-inch, Mid 2011)</description>
     <example>model=iMac12,2</example>
@@ -1210,6 +1329,7 @@
     <param pos="0" name="hw.product" value="iMac (27-inch, Mid 2011)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac12,1$">
     <description>iMac (21.5-inch, Mid 2011)</description>
     <example>model=iMac12,1</example>
@@ -1222,6 +1342,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Mid 2011)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac11,3$">
     <description>iMac (27-inch, Mid 2010)</description>
     <example>model=iMac11,3</example>
@@ -1234,6 +1355,7 @@
     <param pos="0" name="hw.product" value="iMac (27-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac11,2$">
     <description>iMac (21.5-inch, Mid 2010)</description>
     <example>model=iMac11,2</example>
@@ -1246,6 +1368,7 @@
     <param pos="0" name="hw.product" value="iMac (21.5-inch, Mid 2010)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac10,1$">
     <description>iMac (27-inch, Late 2009)</description>
     <example>model=iMac10,1</example>
@@ -1258,6 +1381,7 @@
     <param pos="0" name="hw.product" value="iMac (27-inch, Late 2009)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <fingerprint pattern="^model=iMac9,1$">
     <description>iMac (24-inch, Early 2009)</description>
     <example>model=iMac9,1</example>
@@ -1270,7 +1394,9 @@
     <param pos="0" name="hw.product" value="iMac (24-inch, Early 2009)"/>
     <param pos="0" name="hw.device" value="Desktop"/>
   </fingerprint>
+
   <!-- iPad Pro - Reference for the following: https://www.theiphonewiki.com/ -->
+
   <fingerprint pattern="^model=J32[01]x?AP$">
     <description>iPad Pro (12.9-inch)</description>
     <example>model=J320AP</example>
@@ -1284,6 +1410,7 @@
     <param pos="0" name="hw.product" value="iPad Pro (12.9-inch)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J31[78]x?AP$">
     <description>iPad Pro (11-inch)</description>
     <example>model=J317AP</example>
@@ -1297,6 +1424,7 @@
     <param pos="0" name="hw.product" value="iPad Pro (11-inch)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J20[78]AP$">
     <description>iPad Pro (10.5-inch)</description>
     <example>model=J207AP</example>
@@ -1309,6 +1437,7 @@
     <param pos="0" name="hw.product" value="iPad Pro (10.5-inch)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J12[78]AP$">
     <description>iPad Pro (9.7-inch)</description>
     <example>model=J127AP</example>
@@ -1321,7 +1450,9 @@
     <param pos="0" name="hw.product" value="iPad Pro (9.7-inch)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <!-- iPad -->
+
   <fingerprint pattern="^model=J7[12]bAP$">
     <description>iPad 6th generation)</description>
     <example>model=J72bAP</example>
@@ -1335,6 +1466,7 @@
     <param pos="0" name="hw.product" value="iPad (6th generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J71[ts]AP$">
     <description>iPad (5th generation)</description>
     <example>model=J71tAP</example>
@@ -1347,6 +1479,7 @@
     <param pos="0" name="hw.product" value="iPad (5th generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=P10[123]AP$">
     <description>iPad (4th generation)</description>
     <example>model=P103AP</example>
@@ -1359,7 +1492,9 @@
     <param pos="0" name="hw.product" value="iPad (4th generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <!-- iPad Air -->
+
   <fingerprint pattern="^model=J21[78]AP$">
     <description>iPad Air (3rd generation)</description>
     <example>model=J218AP</example>
@@ -1372,6 +1507,7 @@
     <param pos="0" name="hw.product" value="iPad Air (3rd generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J8[12]AP$">
     <description>iPad Air 2</description>
     <example>model=J81AP</example>
@@ -1384,6 +1520,7 @@
     <param pos="0" name="hw.product" value="iPad Air 2"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J7[123]AP$">
     <description>iPad Air</description>
     <example>model=J72AP</example>
@@ -1396,7 +1533,9 @@
     <param pos="0" name="hw.product" value="iPad Air"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <!-- iPad mini -->
+
   <fingerprint pattern="^model=J21[01]AP$">
     <description>iPad mini (5th generation)</description>
     <example>model=J210AP</example>
@@ -1409,6 +1548,7 @@
     <param pos="0" name="hw.product" value="iPad mini (5th generation)"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J9[67]AP$">
     <description>iPad mini 4</description>
     <example>model=J97AP</example>
@@ -1421,6 +1561,7 @@
     <param pos="0" name="hw.product" value="iPad mini 4"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J8[567]mAP$">
     <description>iPad mini 3</description>
     <example>model=J87mAP</example>
@@ -1433,6 +1574,7 @@
     <param pos="0" name="hw.product" value="iPad mini 3"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J8[567]AP$">
     <description>iPad mini 2</description>
     <example>model=J85AP</example>
@@ -1445,6 +1587,7 @@
     <param pos="0" name="hw.product" value="iPad mini 2"/>
     <param pos="0" name="hw.device" value="Tablet"/>
   </fingerprint>
+
   <fingerprint pattern="^model=P10[567]AP$">
     <description>iPad mini</description>
     <example>model=P105AP</example>
@@ -1458,7 +1601,9 @@
     <param pos="0" name="hw.device" value="Tablet"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:ipad_mini:-"/>
   </fingerprint>
+
   <!-- HomePod -->
+
   <fingerprint pattern="^model=B238a?AP$">
     <description>HomePod</description>
     <example>model=B238aAP</example>
@@ -1471,7 +1616,9 @@
     <param pos="0" name="hw.product" value="HomePod"/>
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
+
   <!-- Apple TV -->
+
   <fingerprint pattern="^model=J105aAP$">
     <description>Apple TV 4K</description>
     <example>model=J105aAP</example>
@@ -1484,6 +1631,7 @@
     <param pos="0" name="hw.product" value="Apple TV 4K"/>
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J42dAP$">
     <description>Apple TV (4th generation)</description>
     <example>model=J42dAP</example>
@@ -1496,6 +1644,7 @@
     <param pos="0" name="hw.product" value="Apple TV (4th generation)"/>
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
+
   <fingerprint pattern="^model=J33[Ii]?AP$">
     <description>Apple TV (3rd generation)</description>
     <example>model=J33IAP</example>
@@ -1510,6 +1659,7 @@
     <param pos="0" name="hw.product" value="Apple TV (3rd generation)"/>
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
+
   <fingerprint pattern="^model=K66AP$">
     <description>Apple TV (2nd generation)</description>
     <example>model=K66AP</example>
@@ -1522,7 +1672,9 @@
     <param pos="0" name="hw.product" value="Apple TV (2nd generation)"/>
     <param pos="0" name="hw.device" value="Media Server"/>
   </fingerprint>
+
   <!-- iPad Pro - Reference for the following: https://www.theiphonewiki.com/ -->
+
   <fingerprint pattern="^model=D331p?AP$">
     <description>iPhone XS Max</description>
     <example>model=D331pAP</example>
@@ -1536,6 +1688,7 @@
     <param pos="0" name="hw.product" value="iPhone XS Max"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D321AP$">
     <description>iPhone XS</description>
     <example>model=D321AP</example>
@@ -1548,6 +1701,7 @@
     <param pos="0" name="hw.product" value="iPhone XS"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N841AP$">
     <description>iPhone XR</description>
     <example>model=N841AP</example>
@@ -1560,6 +1714,7 @@
     <param pos="0" name="hw.product" value="iPhone XR"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D221?AP$">
     <description>iPhone X</description>
     <example>model=D221AP</example>
@@ -1573,6 +1728,7 @@
     <param pos="0" name="hw.product" value="iPhone X"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D211?A?AP$">
     <description>iPhone 8 Plus</description>
     <example>model=D21AP</example>
@@ -1588,6 +1744,7 @@
     <param pos="0" name="hw.product" value="iPhone 8 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D201?A?AP$">
     <description>iPhone 8</description>
     <example>model=D20AP</example>
@@ -1603,6 +1760,7 @@
     <param pos="0" name="hw.product" value="iPhone 8"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D111?AP$">
     <description>iPhone 7 Plus</description>
     <example>model=D11AP</example>
@@ -1616,6 +1774,7 @@
     <param pos="0" name="hw.product" value="iPhone 7 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=D101?AP$">
     <description>iPhone 7</description>
     <example>model=D10AP</example>
@@ -1629,6 +1788,7 @@
     <param pos="0" name="hw.product" value="iPhone 7"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N69u?AP$">
     <description>iPhone SE</description>
     <example>model=N69AP</example>
@@ -1642,6 +1802,7 @@
     <param pos="0" name="hw.product" value="iPhone SE"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N66m?AP$">
     <description>iPhone 6s Plus</description>
     <example>model=N66mAP</example>
@@ -1655,6 +1816,7 @@
     <param pos="0" name="hw.product" value="iPhone 6s Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N71m?AP$">
     <description>iPhone 6s</description>
     <example>model=N71mAP</example>
@@ -1668,6 +1830,7 @@
     <param pos="0" name="hw.product" value="iPhone 6s"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N56AP$">
     <description>iPhone 6 Plus</description>
     <example>model=N56AP</example>
@@ -1680,6 +1843,7 @@
     <param pos="0" name="hw.product" value="iPhone 6 Plus"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N61AP$">
     <description>iPhone 6</description>
     <example>model=N61AP</example>
@@ -1692,6 +1856,7 @@
     <param pos="0" name="hw.product" value="iPhone 6"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N5[13]AP$">
     <description>iPhone 5s</description>
     <example>model=N51AP</example>
@@ -1705,6 +1870,7 @@
     <param pos="0" name="hw.product" value="iPhone 5s"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N4[89]AP$">
     <description>iPhone 5c</description>
     <example>model=N48AP</example>
@@ -1718,6 +1884,7 @@
     <param pos="0" name="hw.product" value="iPhone 5c"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N4[12]AP$">
     <description>iPhone 5</description>
     <example>model=N41AP</example>
@@ -1732,6 +1899,7 @@
     <param pos="0" name="hw.device" value="Mobile Phone"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_5:-"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N94AP$">
     <description>iPhone 4s</description>
     <example>model=N94AP</example>
@@ -1745,6 +1913,7 @@
     <param pos="0" name="hw.device" value="Mobile Phone"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_4s:-"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N9[02]B?AP$">
     <description>iPhone 4</description>
     <example>model=N90AP</example>
@@ -1759,6 +1928,7 @@
     <param pos="0" name="hw.product" value="iPhone 4"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N88AP$">
     <description>iPhone 3GS</description>
     <example>model=N88AP</example>
@@ -1772,6 +1942,7 @@
     <param pos="0" name="hw.device" value="Mobile Phone"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone_3gs:-"/>
   </fingerprint>
+
   <fingerprint pattern="^model=N82AP$">
     <description>iPhone 3G</description>
     <example>model=N82AP</example>
@@ -1784,6 +1955,7 @@
     <param pos="0" name="hw.product" value="iPhone 3G"/>
     <param pos="0" name="hw.device" value="Mobile Phone"/>
   </fingerprint>
+
   <fingerprint pattern="^model=M68AP$">
     <description>iPhone</description>
     <example>model=M68AP</example>
@@ -1797,4 +1969,5 @@
     <param pos="0" name="hw.device" value="Mobile Phone"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:iphone:-"/>
   </fingerprint>
-</fingerprints>
+
+</fingerprints>