recog 2.3.8 → 2.3.9

data/xml/operating_system.xml

@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <fingerprints matches="operating_system.name" database_type="util.os" preference="0.80">
   <!--
     Patterns for common names of various operating systems.
   -->
+
   <!-- Windows begin -->
+
   <fingerprint pattern="^(?i:(?:Microsoft )?(Windows (?:[a-z]+\s[a-z]+\s|[a-z]+\s)?Server (?:\d{4} R2|\d{4}))(?:,\s|\s)?([a-z]+)?(?: Evaluation)?(?: Edition)?(?:\s|\swith(?:out)? Hyper-V\s)?(SP\d|SP \d|Service Pack \d)?)$">
     <description>Windows Server 2003 and later</description>
     <example os.product="Windows Compute Cluster Server 2003">Windows Compute Cluster Server 2003</example>
@@ -23,6 +25,7 @@
     <param pos="2" name="os.edition"/>
     <param pos="3" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows 10 Mobile(?:\s([a-z]+))?(?: Edition)?)$">
     <description>Windows 10 Mobile</description>
     <example os.product="Windows 10 Mobile">Windows 10 Mobile Edition</example>
@@ -34,6 +37,7 @@
     <param pos="0" name="os.device" value="Mobile"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_10_mobile:-"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?(Windows (?:XP|Vista|7|8|8.1|10))(?:\s)?((?:[a-z]+|[a-z]+, )?(?:[a-z]+|[a-z]+\s[a-z]+)?)?(?: Edition)?(?:\s)?(SP\d|SP \d|Service Pack \d)?)$">
     <description>Windows Desktop XP and later</description>
     <example os.product="Windows XP" os.edition="Professional">Windows XP Professional</example>
@@ -51,6 +55,7 @@
     <param pos="2" name="os.edition"/>
     <param pos="3" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows 2000(?:\s)?([a-z]+|[a-z]+\s[a-z]+)?(?:\s)?(SP\d|SP \d|Service Pack \d)?)$">
     <description>Windows 2000</description>
     <example os.edition="Professional">Windows 2000 Professional</example>
@@ -62,6 +67,7 @@
     <param pos="2" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_2000:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows NT (\d.\d{1,2})?(?:\s)?([a-z]+|[a-z]+\s[a-z]+)?)$">
     <description>Windows NT</description>
     <example os.version="3.51" os.edition="Server">Windows NT 3.51 Server</example>
@@ -75,6 +81,7 @@
     <param pos="2" name="os.edition"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows_nt:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows Phone (\d|\d\.\d)?)$">
     <description>Windows Phone 7 and later</description>
     <example os.version="7.5">Windows Phone 7.5</example>
@@ -85,6 +92,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.device" value="Mobile"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?(Windows\s?(?:95|98|98SE|98 SE|98 Second Edition|ME|Millenium Edition)))$">
     <description>Windows 9x</description>
     <example os.product="Windows 98 SE">Windows 98 SE</example>
@@ -92,6 +100,7 @@
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="1" name="os.product"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows(?:\sNT)? 6.1)$">
     <description>Windows version 6.1 (Windows 7 or Windows Server 2008 R2)</description>
     <example>Windows 6.1</example>
@@ -99,6 +108,7 @@
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows 7 or Windows Server 2008 R2"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows(?:\sNT)? 6.2)$">
     <description>Windows version 6.2 (Windows 8 or Windows Server 2012)</description>
     <example>Windows 6.2</example>
@@ -106,6 +116,7 @@
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows 8 or Windows Server 2012"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows(?:\sNT)? 6.3)$">
     <description>Windows version 6.3 (Windows 8.1 or Windows Server 2012 R2)</description>
     <example>Windows 6.3</example>
@@ -113,6 +124,7 @@
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows 8.1 or Windows Server 2012 R2"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows(?:\sNT)? 10.0)$">
     <description>Windows version 10.0 (Windows 10 or Windows Server 2016)</description>
     <example>Windows 10.0</example>
@@ -120,6 +132,7 @@
     <param pos="0" name="os.family" value="Windows"/>
     <param pos="0" name="os.product" value="Windows 10 or Windows Server 2016"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Microsoft )?Windows.*)$">
     <description>Windows catch-all</description>
     <example>Windows for Workgroups 3.11</example>
@@ -130,8 +143,11 @@
     <param pos="0" name="os.certainty" value="0.5"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:microsoft:windows:-"/>
   </fingerprint>
+
   <!-- Windows end -->
+
   <!-- Liunx begin -->
+
   <fingerprint pattern="^(?i:Alpine Linux\s?(?:v)?(\d+?(?:\.\d+?)*?(?:\src\d+?)?)?)$">
     <description>Alpine Linux</description>
     <example os.version="3.4.0">Alpine Linux v3.4.0</example>
@@ -141,7 +157,9 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <!-- Arch uses rolling releases where the version name just the date of an ISO release. -->
+
   <fingerprint pattern="^(?i:Arch Linux\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Arch Linux</description>
     <example os.version="2016.04.01">Arch Linux 2016.04.01</example>
@@ -150,7 +168,9 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <!-- Red Hat Enterprise Linux derivative -->
+
   <fingerprint pattern="^(?i:Amazon Linux(?: AMI)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Amazon Linux AMI</description>
     <example os.version="5.11">Amazon Linux AMI 5.11</example>
@@ -161,7 +181,9 @@
     <param pos="0" name="os.product" value="Linux AMI"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <!-- Red Hat Enterprise Linux derivative -->
+
   <fingerprint pattern="^(?i:CentOS(?: Linux)?(?: [a-z]+)?\s?(\d+?(?:\.\d+?)*?)?)(?:\s.*?)?$">
     <description>Centos Linux</description>
     <example os.version="5.11">Centos Linux 5.11</example>
@@ -174,6 +196,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:centos:centos:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:Debian(?: (?:GNU\/)?Linux)?\s?((?:\d+?(?:\.\d+?)*?)|(?:\w+?\/sid\s?))?(?:\s[a-z\(\)]+)?)$">
     <description>Debian Linux</description>
     <example os.version="6.0">Debian 6.0</example>
@@ -186,6 +209,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:debian:debian_linux:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:Fedora(?: Core)?(?: Linux)?(?: release)?\s?(\d+?)?(?:\s.*)?)$">
     <description>Fedora Linux</description>
     <example os.version="6">Fedora Core 6</example>
@@ -197,7 +221,9 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:linux:{os.version}"/>
   </fingerprint>
+
   <!-- Gentoo currently uses rolling releases with no version, but older versions were typically based on the year of release. -->
+
   <fingerprint pattern="^(?i:Gentoo(?: Linux)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Gentoo Linux</description>
     <example>Gentoo Linux</example>
@@ -207,7 +233,9 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:gentoo:linux:{os.version}"/>
   </fingerprint>
+
   <!-- Kali switched to rolling release in January 2016. -->
+
   <fingerprint pattern="^(?i:Kali(?: Linux)?\s?(\d+?(?:\.\d+?)+?(?:[a-z])?|\d+?)?)$">
     <description>Kali Linux</description>
     <example os.version="1.0.0">Kali Linux 1.0.0</example>
@@ -219,7 +247,9 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <!-- Ubuntu derivative -->
+
   <fingerprint pattern="^(?i:Kubuntu(?: Linux)?\s(\d+?(?:\.\d+?)*?)?\s?(LTS)?)$">
     <description>Kubuntu Linux</description>
     <example os.version="12.04.4">Kubuntu 12.04.4 LTS</example>
@@ -231,7 +261,9 @@
     <param pos="1" name="os.version"/>
     <param pos="2" name="os.edition"/>
   </fingerprint>
+
   <!-- Red Hat Enterprise Linux derivative -->
+
   <fingerprint pattern="^(?i:Oracle(?: Enterprise)? Linux\s?(?:Server\s?)?(\d+?(?:\.\d+?)*?)?)$">
     <description>Oracle Enterprise Linux</description>
     <example os.version="5.11">Oracle Enterprise Linux 5.11</example>
@@ -242,6 +274,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:oracle:linux:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:OpenSUSE(?: Linux)?(?: [a-z]+?)??\s?(\d+?(?:\.\d+?)*?)?(?:\s\(.*)?)$">
     <description>OpenSUSE Linux</description>
     <example os.version="10.1">OpenSUSE Linux 10.1</example>
@@ -252,6 +285,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Red Hat|RedHat|Red-Hat|RHEL)(?: Enterprise)?(?: Linux)?(?: [a-z]+)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Red Hat Enterprise Linux</description>
     <example>Red Hat Enterprise Linux AS</example>
@@ -265,7 +299,9 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:redhat:enterprise_linux:{os.version}"/>
   </fingerprint>
+
   <!-- Red Hat Enterprise Linux derivative -->
+
   <fingerprint pattern="^(?i:Scientific(?: Linux)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Scientific Linux</description>
     <example os.version="5.11">Scientific Linux 5.11</example>
@@ -276,6 +312,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:Slackware(?: Linux)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Slackware Linux</description>
     <example os.version="14.1">Slackware Linux 14.1</example>
@@ -284,6 +321,7 @@
     <param pos="0" name="os.product" value="Linux"/>
     <param pos="1" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:SUSE(?: SLED)?(?: Linux Enterprise Desktop)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>SUSE Linux Enterprise Desktop</description>
     <example os.version="11">SUSE SLED 11</example>
@@ -294,6 +332,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:suse:linux_enterprise_desktop:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:SUSE(?: SLES)?(?: Linux Enterprise Server)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>SUSE Linux Enterprise Server</description>
     <example os.version="11">SUSE SLES 11</example>
@@ -304,6 +343,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:suse:linux_enterprise_server:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:SLES(?: Linux Enterprise Server)?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>SLES Linux Enterprise Server</description>
     <example os.version="11">SLES 11</example>
@@ -314,6 +354,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:suse:linux_enterprise_server:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:Ubuntu(?: Linux)?(?:\s|-)(\d+?(?:\.\d+?)*?)?\s?(LTS)?)$">
     <description>Ubuntu Linux</description>
     <example os.version="12.04.4">Ubuntu 12.04.4 LTS</example>
@@ -327,7 +368,9 @@
     <param pos="2" name="os.edition"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:canonical:ubuntu_linux:{os.version}"/>
   </fingerprint>
+
   <!-- Ubuntu derivative -->
+
   <fingerprint pattern="^(?i:Xubuntu(?: Linux)?\s(\d+?(?:\.\d+?)*?)?\s?(LTS)?)$">
     <description>Xubuntu Linux</description>
     <example os.version="12.04.4">Xubuntu 12.04.4 LTS</example>
@@ -339,17 +382,20 @@
     <param pos="1" name="os.version"/>
     <param pos="2" name="os.edition"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:VMWare Photon(?:\/)?(?:\s?Linux)?\s?(?:v)?(\d+?(?:\.\d+?)*?)?)$">
     <description>Photon Linux</description>
     <example>VMWare Photon Linux</example>
     <example os.version="1.0">VMWare Photon 1.0</example>
-    <param pos="0" name="os.vendor" value="VMWare"/>
+    <param pos="0" name="os.vendor" value="VMware"/>
     <param pos="0" name="os.family" value="Linux"/>
     <param pos="0" name="os.product" value="Photon Linux"/>
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:vmware:photon_os:{os.version}"/>
   </fingerprint>
+
   <!-- Vendor-based distribution catch-call -->
+
   <fingerprint pattern="^(?i:(.*)\sLinux?\s(.*))$">
     <description>Vendor-based Linux catch-all</description>
     <example os.vendor="Aurox" os.version="10.2">Aurox Linux 10.2</example>
@@ -359,7 +405,9 @@
     <param pos="1" name="os.vendor"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <!-- Linux catch-all goes at the bottom-->
+
   <fingerprint pattern="^(?i:.*Linux?\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Linux catch-all</description>
     <example os.version="2.42.6">Linux 2.42.6</example>
@@ -370,9 +418,13 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:linux:linux_kernel:{os.version}"/>
   </fingerprint>
+
   <!-- Linux end -->
+
   <!-- Mac begin -->
+
   <!-- Match Mac OS Classic first due to weak matching on Mac OS X -->
+
   <fingerprint pattern="^(?i:(?:Apple )?Mac OS ([7-9](?:\.\d+?)*?))$">
     <description>Mac OS 9</description>
     <example os.version="9">Mac OS 9</example>
@@ -383,6 +435,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Apple OS X|Apple Mac OS X|Mac OS X|OS X|Mac OS)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Mac OS X with version number</description>
     <example os.version="10.10.5">Mac OS X 10.10.5</example>
@@ -394,6 +447,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Apple )?Mac OS X Cheetah)$">
     <description>Mac OS X Cheetah</description>
     <example os.version="10.0">Mac OS X Cheetah</example>
@@ -403,6 +457,7 @@
     <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>
+
   <fingerprint pattern="^(?i:(?:Apple )?Mac OS X Puma)$">
     <description>Mac OS X Puma</description>
     <example os.version="10.1">Mac OS X Puma</example>
@@ -412,6 +467,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="^(?i:(?:Apple )?Mac OS X Jaguar)$">
     <description>Mac OS X Jaguar</description>
     <example os.version="10.2">Mac OS X Jaguar</example>
@@ -421,6 +477,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="^(?i:(?:Apple )?Mac OS X Panther)$">
     <description>Mac OS X Panther</description>
     <example os.version="10.3">Mac OS X Panther</example>
@@ -430,6 +487,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="^(?i:(?:Apple )?Mac OS X Tiger)$">
     <description>Mac OS X Tiger</description>
     <example os.version="10.4">Mac OS X Tiger</example>
@@ -439,6 +497,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="^(?i:(?:Apple )?Mac OS X Leopard)$">
     <description>Mac OS X Leopard</description>
     <example os.version="10.5">Mac OS X Leopard</example>
@@ -448,6 +507,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="^(?i:(?:Apple )?Mac OS X Snow Leopard)$">
     <description>Mac OS X Snow Leopard</description>
     <example os.version="10.6">Mac OS X Snow Leopard</example>
@@ -457,6 +517,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="^(?i:(?:Apple )?Mac OS X Lion)$">
     <description>Mac OS X Lion</description>
     <example os.version="10.7">Mac OS X Lion</example>
@@ -466,6 +527,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="^(?i:(?:Apple )?Mac OS X Mountain Lion)$">
     <description>Mac OS X Mountain Lion</description>
     <example os.version="10.8">Mac OS X Mountain Lion</example>
@@ -475,6 +537,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="^(?i:(?:Apple )?Mac OS X Mavericks)$">
     <description>Mac OS X Mavericks</description>
     <example os.version="10.9">Mac OS X Mavericks</example>
@@ -484,6 +547,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="^(?i:(?:Apple )?Mac OS X Yosemite)$">
     <description>Mac OS X Yosemite</description>
     <example os.version="10.10">Mac OS X Yosemite</example>
@@ -493,6 +557,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="^(?i:(?:Apple )?Mac OS X El Capitan)$">
     <description>Mac OS X El Capitan</description>
     <example os.version="10.11">Mac OS X El Capitan</example>
@@ -502,7 +567,9 @@
     <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>
+
   <!-- This can also match Cisco IOS if the vendor name is not present. -->
+
   <fingerprint pattern="^(?i:(?:Apple )?iOS\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Apple iOS for iPhone and iPad</description>
     <example os.version="7.1.2">iOS 7.1.2</example>
@@ -515,8 +582,11 @@
     <param pos="0" name="os.device" value="Mobile"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:iphone_os:{os.version}"/>
   </fingerprint>
+
   <!-- Mac end -->
+
   <!-- BSD begin -->
+
   <fingerprint pattern="^(?i:(.*?BSD)\s?(\d+?(?:\.\d+?)*?(?:[\-\/_ ]?\w+?)?(?:-[a-z]\d+?)?)?)$">
     <description>Many BSD family OSes</description>
     <example os.version="10.3-RELEASE" os.product="FreeBSD">FreeBSD 10.3-RELEASE</example>
@@ -529,8 +599,11 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <!-- BSD end -->
+
   <!-- Other Unix-likes begin -->
+
   <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?OpenSolaris\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>OpenSolaris</description>
     <example os.version="2009.06">OpenSolaris 2009.06</example>
@@ -540,6 +613,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?Solaris\s?(1[1-9]?(?:\.\d+?)*?)?)$">
     <description>Solaris 11 and up</description>
     <example os.version="11.3">Solaris 11.3</example>
@@ -550,6 +624,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:oracle:solaris:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?Solaris\s?((?:[789]|10)+?(?:\.\d+?)*?)?)$">
     <description>Solaris 7-10</description>
     <example os.version="7">Solaris 7</example>
@@ -562,6 +637,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?SunOS\s?5.([789]|10)?)$">
     <description>SunOS/Solaris 5.7-5.10</description>
     <example os.version="7">SunOS 5.7</example>
@@ -572,6 +648,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:sun:solaris:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:Oracle|Sun)?\s?SunOS\s?5.(1[1-9])?)$">
     <description>Oracle/Solaris 5.11 and upwards</description>
     <example os.version="11">SunOS 5.11</example>
@@ -581,6 +658,7 @@
     <param pos="1" name="os.version"/>
     <param pos="0" name="os.cpe23" value="cpe:/o:oracle:solaris:{os.version}"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:IBM\s?)?(AIX|MVS|OS/(?:\d{1,3})|VM/CMS|VM/ESA|z/OS)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>IBM OSes</description>
     <example os.product="AIX">AIX</example>
@@ -596,6 +674,7 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <fingerprint pattern="^(?i:(?:HP\s?)?(Digital UNIX|HP-UX|iLO|OpenVMS|ProLiant|Tru64 UNIX)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>HP OSes</description>
     <example os.product="HP-UX">HP-UX</example>
@@ -605,8 +684,11 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <!-- Other Unix-likes end -->
+
   <!-- Network equipment begin -->
+
   <fingerprint pattern="^(?i:(?:Juniper\s?)?(Junos|Junos OS|ScreenOS)\s?(\d+?(?:\.\d+?)*?)?)$">
     <description>Juniper</description>
     <example>Junos</example>
@@ -616,7 +698,9 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <!-- This needs to be improved if it's not how one would generally present a Cisco OS version. -->
+
   <fingerprint pattern="^(?i:(?:Cisco\s?)?(ASA|Adaptive Security Appliance|IOS|IOS-XE|IOS-XR|NX-OS|PIX-OS|SAN-OS)\s?(?:Version (\S+))?)$">
     <description>Cisco</description>
     <example>Cisco ASA</example>
@@ -626,5 +710,7 @@
     <param pos="1" name="os.product"/>
     <param pos="2" name="os.version"/>
   </fingerprint>
+
   <!-- Network equipment end -->
-</fingerprints>
+
+</fingerprints>