diff --git a/internals2/memory/TSRM.xml b/internals2/memory/TSRM.xml
new file mode 100644
index 0000000000..6208c00e70
--- /dev/null
+++ b/internals2/memory/TSRM.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- $Revision: 1.1 $ -->
+ <sect1 xml:id="internals2.memory.TSRM" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Thread-Safe Resource Manager</title>
+  
+  <simpara>
+  </simpara>
+
+ </sect1>
diff --git a/internals2/memory/index.xml b/internals2/memory/index.xml
index 9d0a4586aa..404ea01a8f 100644
--- a/internals2/memory/index.xml
+++ b/internals2/memory/index.xml
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
  <chapter xml:id="internals2.memory" xmlns="http://docbook.org/ns/docbook">
   <title>Memory management</title>
-  <para>
-  </para>
+
+  <simpara>
+   Memory management in the Zend Engine is deceptively simple. There are some
+   APIs to learn, and some concepts behind them to understand, but that's about
+   all.
+  </simpara>
+  
+  &internals2.memory.management;
+  &internals2.memory.persistence;
+  &internals2.memory.TSRM;
+  
  </chapter>
 
 <!-- Keep this comment at the end of the file
diff --git a/internals2/memory/management.xml b/internals2/memory/management.xml
new file mode 100644
index 0000000000..3e5032a80d
--- /dev/null
+++ b/internals2/memory/management.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- $Revision: 1.1 $ -->
+ <sect1 xml:id="internals2.memory.management" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Basic memory management</title>
+
+  <simpara>
+  </simpara>
+
+ </sect1>
\ No newline at end of file
diff --git a/internals2/memory/persistence.xml b/internals2/memory/persistence.xml
new file mode 100644
index 0000000000..0aa9fddc14
--- /dev/null
+++ b/internals2/memory/persistence.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- $Revision: 1.1 $ -->
+ <sect1 xml:id="internals2.memory.persistence" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <title>Data persistence</title>
+  
+  <simpara>
+  </simpara>
+
+ </sect1>
diff --git a/internals2/structure/index.xml b/internals2/structure/index.xml
index 627d3f641c..63a81d410e 100644
--- a/internals2/structure/index.xml
+++ b/internals2/structure/index.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
  <chapter xml:id="internals2.structure" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
 
   <title>Extension structure</title>
-  <para>
+  <simpara>
    Many extension-writing guides focus on simple examples first and ignore the
    requirements of more complex implementations until later. Often such guides
    must repeat themselves over and over in order to describe these new
@@ -11,7 +11,7 @@
    a mature, practical implementation, in order to prepare users for needs and
    issues they will almost always encounter in the process of extension
    development.
-  </para>
+  </simpara>
   
   &internals2.structure.files;
   &internals2.structure.basics;
diff --git a/internals2/structure/tests.xml b/internals2/structure/tests.xml
index 659969843e..dd95d91d93 100644
--- a/internals2/structure/tests.xml
+++ b/internals2/structure/tests.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
  <sect1 xml:id="internals2.structure.tests" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
   <title>Testing an extension</title>
-  <para/>
+
+  <simpara>
+   One of the accepted requirements of good programming is testing. PHP provides
+   a test harness for unit regression tests, in the form of a script called
+   <command>run-tests.php</command>.
+  </simpara>
+
+  <simpara>
+   Tests for a particular module are stored in the <filename>tests/</filename>
+   subdirectory of the module's folder, and have a <filename>.phpt</filename>
+   extension. For details of the PHPT format, see
+   <link xlink:href="http://qa.php.net/write-test.php"/>.
+  </simpara>
+
  </sect1>
 
 <!-- Keep this comment at the end of the file