diff --git a/language/context/ftp.xml b/language/context/ftp.xml
index 1fa6f4bdff0f..a29a41af5674 100644
--- a/language/context/ftp.xml
+++ b/language/context/ftp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.ftp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.ftp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>FTP context options</refname>
   <refpurpose>FTP context option listing</refpurpose>
diff --git a/language/context/http.xml b/language/context/http.xml
index 2234cc4d9d2e..46f972063fd8 100644
--- a/language/context/http.xml
+++ b/language/context/http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>HTTP context options</refname>
   <refpurpose>HTTP context option listing</refpurpose>
diff --git a/language/context/parameters.xml b/language/context/parameters.xml
index b2655d2c6f22..33788912feda 100644
--- a/language/context/parameters.xml
+++ b/language/context/parameters.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.params" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>Context parameters</refname>
   <refpurpose>Context parameter listing</refpurpose>
diff --git a/language/context/phar.xml b/language/context/phar.xml
index 2126e0b7da89..32b5f4f93dee 100644
--- a/language/context/phar.xml
+++ b/language/context/phar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.phar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.phar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>Phar context options</refname>
   <refpurpose>Phar context option listing</refpurpose>
diff --git a/language/context/socket.xml b/language/context/socket.xml
index a5d4168a22ba..7308c5f91156 100644
--- a/language/context/socket.xml
+++ b/language/context/socket.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.socket" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.socket" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>Socket context options</refname>
   <refpurpose>Socket context option listing</refpurpose>
diff --git a/language/context/ssl.xml b/language/context/ssl.xml
index 830eb730d98d..ef5ac318521d 100644
--- a/language/context/ssl.xml
+++ b/language/context/ssl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.ssl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.ssl" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>SSL context options</refname>
   <refpurpose>SSL context option listing</refpurpose>
diff --git a/language/context/zip.xml b/language/context/zip.xml
index 6c65ea00356d..addb5229a034 100644
--- a/language/context/zip.xml
+++ b/language/context/zip.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.zip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.zip" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>Zip context options</refname>
   <refpurpose>Zip context option listing</refpurpose>
diff --git a/language/context/zlib.xml b/language/context/zlib.xml
index 4ab8fb71ad60..7f79ec94c9cf 100644
--- a/language/context/zlib.xml
+++ b/language/context/zlib.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="context.zlib" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="context.zlib" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_context_option">
  <refnamediv>
   <refname>Zlib context options</refname>
   <refpurpose>Zlib context option listing</refpurpose>
diff --git a/language/wrappers/audio.xml b/language/wrappers/audio.xml
index 77dbaab548b1..d5ba3ccb913f 100644
--- a/language/wrappers/audio.xml
+++ b/language/wrappers/audio.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.audio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.audio" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>ogg://</refname>
   <refpurpose>Audio streams</refpurpose>
diff --git a/language/wrappers/compression.xml b/language/wrappers/compression.xml
index d44776f69384..67b379de8b0f 100644
--- a/language/wrappers/compression.xml
+++ b/language/wrappers/compression.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.compression" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.compression" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>zlib://</refname>
   <refname>bzip2://</refname>
diff --git a/language/wrappers/data.xml b/language/wrappers/data.xml
index 3afdf0a01b27..8ed147d4b69d 100644
--- a/language/wrappers/data.xml
+++ b/language/wrappers/data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.data" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>data://</refname>
   <refpurpose>Data (RFC 2397)</refpurpose>
diff --git a/language/wrappers/expect.xml b/language/wrappers/expect.xml
index f8992350d71c..b3534220ad1e 100644
--- a/language/wrappers/expect.xml
+++ b/language/wrappers/expect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.expect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.expect" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>expect://</refname>
   <refpurpose>Process Interaction Streams</refpurpose>
diff --git a/language/wrappers/file.xml b/language/wrappers/file.xml
index e4404770f308..ad5835e25b59 100644
--- a/language/wrappers/file.xml
+++ b/language/wrappers/file.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.file" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>file://</refname>
   <refpurpose>Accessing local filesystem</refpurpose>
diff --git a/language/wrappers/ftp.xml b/language/wrappers/ftp.xml
index dc76d30b8170..68333ca76d8c 100644
--- a/language/wrappers/ftp.xml
+++ b/language/wrappers/ftp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.ftp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.ftp" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>ftp://</refname>
   <refname>ftps://</refname>
diff --git a/language/wrappers/glob.xml b/language/wrappers/glob.xml
index 1095ba3978c6..cde7e4e1d733 100644
--- a/language/wrappers/glob.xml
+++ b/language/wrappers/glob.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.glob" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.glob" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>glob://</refname>
   <refpurpose>Find pathnames matching pattern</refpurpose>
diff --git a/language/wrappers/http.xml b/language/wrappers/http.xml
index 16cb5570d508..6558ed019004 100644
--- a/language/wrappers/http.xml
+++ b/language/wrappers/http.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.http" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>http://</refname>
   <refname>https://</refname>
diff --git a/language/wrappers/phar.xml b/language/wrappers/phar.xml
index 813e90769c1f..285522438dbb 100644
--- a/language/wrappers/phar.xml
+++ b/language/wrappers/phar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.phar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.phar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>phar://</refname>
   <refpurpose>PHP Archive</refpurpose>
diff --git a/language/wrappers/php.xml b/language/wrappers/php.xml
index bb32b3ab1a0e..ad54edfb7bfd 100644
--- a/language/wrappers/php.xml
+++ b/language/wrappers/php.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.php" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.php" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>php://</refname>
   <refpurpose>Accessing various I/O streams</refpurpose>
diff --git a/language/wrappers/rar.xml b/language/wrappers/rar.xml
index 9cf9bf790d6b..808984515938 100644
--- a/language/wrappers/rar.xml
+++ b/language/wrappers/rar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.rar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.rar" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>rar://</refname>
   <refpurpose>RAR</refpurpose>
diff --git a/language/wrappers/ssh2.xml b/language/wrappers/ssh2.xml
index b137f8caf306..c4c0698d1c14 100644
--- a/language/wrappers/ssh2.xml
+++ b/language/wrappers/ssh2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<refentry xml:id="wrappers.ssh2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false">
+<refentry xml:id="wrappers.ssh2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="verify_info:false" role="stream_wrapper">
  <refnamediv>
   <refname>ssh2://</refname>
   <refpurpose>Secure Shell 2</refpurpose>