diff --git a/entities/acronyms.xml b/entities/acronyms.xml
index 202a02645..a6995c0f6 100644
--- a/entities/acronyms.xml
+++ b/entities/acronyms.xml
@@ -30,6 +30,12 @@
     <simpara>Bitmap</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>CA</term>
+   <listitem>
+    <simpara>Certificate Authority</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>CGI</term>
    <listitem>
@@ -66,6 +72,12 @@
     <simpara>Comma Separated Value</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>cURL</term>
+   <listitem>
+    <simpara>Client URL Library</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>CVS</term>
    <listitem>
@@ -90,6 +102,18 @@
     <simpara>Disjunctive Normal Form</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>DNS</term>
+   <listitem>
+    <simpara>Domain Name System</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>DOM</term>
+   <listitem>
+    <simpara>Document Object Model</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>DSSSL</term>
    <listitem>
@@ -114,12 +138,24 @@
     <simpara>Frequently Asked Questions</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>FPM</term>
+   <listitem>
+    <simpara>FastCGI Process Manager</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>FTP</term>
    <listitem>
     <simpara>File Transfer Protocol</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>FTPS</term>
+   <listitem>
+    <simpara>File Transfer Protocol SSL/Secure</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>GD</term>
    <listitem>
@@ -174,6 +210,18 @@
     <simpara>Hypertext Transfer Protocol</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>HTTPS</term>
+   <listitem>
+    <simpara>Hypertext Transfer Protocol Secure</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>HSTS</term>
+   <listitem>
+    <simpara>HTTP Strict Transport Security</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>IDE</term>
    <listitem>
@@ -198,6 +246,24 @@
     <simpara>Internet Message Access Protocol</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>IP</term>
+   <listitem>
+    <simpara>Internet Protocol</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>IPv4</term>
+   <listitem>
+    <simpara>Internet Protocol version 4</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>IPv6</term>
+   <listitem>
+    <simpara>Internet Protocol version 6</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>JB2</term>
    <listitem>
@@ -228,6 +294,12 @@
     <simpara>JavaScript Object Notation</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>LDAP</term>
+   <listitem>
+    <simpara>Lightweight Directory Access Protocol</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>LFS</term>
    <listitem>
@@ -270,6 +342,12 @@
     <simpara>Portable Document Format</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>PDO</term>
+   <listitem>
+    <simpara>PHP Data Objects</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>PECL</term>
    <listitem>
@@ -282,6 +360,12 @@
     <simpara>Privacy-Enhanced Mail</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>Phar</term>
+   <listitem>
+    <simpara>PHP archive</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>PHP</term>
    <listitem>
@@ -324,6 +408,12 @@
     <simpara>Red-Green-Blue</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>RTSP</term>
+   <listitem>
+    <simpara>Real-Time Streaming Protocol</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>SAPI</term>
    <listitem>
@@ -336,12 +426,42 @@
     <simpara>Simple Authentication and Security Layer</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>SFTP</term>
+   <listitem>
+    <simpara>SSH/Secure File Transfer Protocol</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>SMTP</term>
+   <listitem>
+    <simpara>Simple Mail Transfer Protocol</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>SNMP</term>
    <listitem>
     <simpara>Simple Network Management Protocol</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>SPL</term>
+   <listitem>
+    <simpara>Standard PHP Library</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>SSH</term>
+   <listitem>
+    <simpara>Secure Shell Protocol</simpara>
+   </listitem>
+  </varlistentry>
+  <varlistentry>
+   <term>SSL</term>
+   <listitem>
+    <simpara>Secure Sockets Layer</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>SWF</term>
    <listitem>
@@ -360,6 +480,12 @@
     <simpara>Tagged Image File Format</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>TLS</term>
+   <listitem>
+    <simpara>Transport Layer Security</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>TNS</term>
    <listitem>
@@ -372,6 +498,12 @@
     <simpara>User Defined Functions</simpara>
    </listitem>
   </varlistentry>
+  <varlistentry>
+   <term>UDP</term>
+   <listitem>
+    <simpara>User Datagram Protocol</simpara>
+   </listitem>
+  </varlistentry>
   <varlistentry>
    <term>Unicode</term>
    <listitem>
diff --git a/entities/global.ent b/entities/global.ent
index 031391940..84f599635 100644
--- a/entities/global.ent
+++ b/entities/global.ent
@@ -606,5 +606,45 @@
 <!ENTITY httpd.conf '<filename xmlns="http://docbook.org/ns/docbook">httpd.conf</filename>'>
 <!ENTITY htaccess '<filename xmlns="http://docbook.org/ns/docbook">.htaccess</filename>'>
 
+<!-- Acronyms -->
+<!ENTITY api '<acronym xmlns="http://docbook.org/ns/docbook">API</acronym>'>
+<!ENTITY ascii '<acronym xmlns="http://docbook.org/ns/docbook">ASCII</acronym>'>
+<!ENTITY ca '<acronym xmlns="http://docbook.org/ns/docbook">CA</acronym>'>
+<!ENTITY cgi '<acronym xmlns="http://docbook.org/ns/docbook">CGI</acronym>'>
 <!ENTITY cli '<acronym xmlns="http://docbook.org/ns/docbook">CLI</acronym>'>
 <!ENTITY cli.sapi '<acronym xmlns="http://docbook.org/ns/docbook">CLI</acronym> <acronym xmlns="http://docbook.org/ns/docbook">SAPI</acronym>'>
+<!ENTITY curl '<acronym xmlns="http://docbook.org/ns/docbook">cURL</acronym>'>
+<!ENTITY der '<acronym xmlns="http://docbook.org/ns/docbook">DER</acronym>'>
+<!ENTITY dns '<acronym xmlns="http://docbook.org/ns/docbook">DNS</acronym>'>
+<!ENTITY dom '<acronym xmlns="http://docbook.org/ns/docbook">DOM</acronym>'>
+<!ENTITY fpm '<acronym xmlns="http://docbook.org/ns/docbook">FPM</acronym>'>
+<!ENTITY ftp '<acronym xmlns="http://docbook.org/ns/docbook">FTP</acronym>'>
+<!ENTITY ftps '<acronym xmlns="http://docbook.org/ns/docbook">FTPS</acronym>'>
+<!ENTITY hmac '<acronym xmlns="http://docbook.org/ns/docbook">HMAC</acronym>'>
+<!ENTITY html '<acronym xmlns="http://docbook.org/ns/docbook">HTML</acronym>'>
+<!ENTITY http '<acronym xmlns="http://docbook.org/ns/docbook">HTTP</acronym>'>
+<!ENTITY https '<acronym xmlns="http://docbook.org/ns/docbook">HTTPS</acronym>'>
+<!ENTITY hsts '<acronym xmlns="http://docbook.org/ns/docbook">HSTS</acronym>'>
+<!ENTITY ip '<acronym xmlns="http://docbook.org/ns/docbook">IP</acronym>'>
+<!ENTITY ipv4 '<acronym xmlns="http://docbook.org/ns/docbook">IPv4</acronym>'>
+<!ENTITY ipv6 '<acronym xmlns="http://docbook.org/ns/docbook">IPv6</acronym>'>
+<!ENTITY json '<acronym xmlns="http://docbook.org/ns/docbook">JSON</acronym>'>
+<!ENTITY ldap '<acronym xmlns="http://docbook.org/ns/docbook">LDAP</acronym>'>
+<!ENTITY pdo '<acronym xmlns="http://docbook.org/ns/docbook">PDO</acronym>'>
+<!ENTITY pem '<acronym xmlns="http://docbook.org/ns/docbook">PEM</acronym>'>
+<!ENTITY phar '<acronym xmlns="http://docbook.org/ns/docbook">Phar</acronym>'>
+<!ENTITY php '<acronym xmlns="http://docbook.org/ns/docbook">PHP</acronym>'>
+<!ENTITY pop3 '<acronym xmlns="http://docbook.org/ns/docbook">POP3</acronym>'>
+<!ENTITY rtsp '<acronym xmlns="http://docbook.org/ns/docbook">RTSP</acronym>'>
+<!ENTITY sapi '<acronym xmlns="http://docbook.org/ns/docbook">SAPI</acronym>'>
+<!ENTITY sftp '<acronym xmlns="http://docbook.org/ns/docbook">SFTP</acronym>'>
+<!ENTITY smtp '<acronym xmlns="http://docbook.org/ns/docbook">SMTP</acronym>'>
+<!ENTITY spl '<acronym xmlns="http://docbook.org/ns/docbook">SPL</acronym>'>
+<!ENTITY ssh '<acronym xmlns="http://docbook.org/ns/docbook">SSH</acronym>'>
+<!ENTITY ssl '<acronym xmlns="http://docbook.org/ns/docbook">SSL</acronym>'>
+<!ENTITY tcp '<acronym xmlns="http://docbook.org/ns/docbook">TCP</acronym>'>
+<!ENTITY tls '<acronym xmlns="http://docbook.org/ns/docbook">TLS</acronym>'>
+<!ENTITY udp '<acronym xmlns="http://docbook.org/ns/docbook">UDP</acronym>'>
+<!ENTITY uri '<acronym xmlns="http://docbook.org/ns/docbook">URI</acronym>'>
+<!ENTITY url '<acronym xmlns="http://docbook.org/ns/docbook">URL</acronym>'>
+<!ENTITY xml '<acronym xmlns="http://docbook.org/ns/docbook">XML</acronym>'>