Merge branch 'phptek-2016'

Author: stevegrunwell

css/source/theme.scss

@@ -84,4 +84,8 @@ section.has-light-background {
 		margin-right: 1em;
 		transform: rotate(-8deg);
 	}
+
+	dd + dt {
+		margin-top: 1em;
+	}
 }

css/theme.css

@@ -308,3 +308,6 @@ body {
   margin-top: 2em;
   margin-right: 1em;
   transform: rotate(-8deg); }
+
+.slides dd + dt {
+  margin-top: 1em; }

resources/phptek-2016.jpg

@@ -0,0 +1 @@
+<!-- .slide: data-background="resources/phptek-2016.jpg" data-background-size="contain" -->

slides/exec.md

@@ -1,4 +1,5 @@
 [
+    "intro.md",
     "index.md",
     [
         "about-me.md",
@@ -34,11 +35,8 @@
         "argc.md",
         "args.md",
         "system-commands.md",
-        "exec.md",
-        "shell_exec.md",
-        "shell_exec2.md",
-        "system.md",
-        "passthru.md",
+        "system-commands2.md",
+        "system-commands3.md",
         "escaping-shell-commands.md",
         "escapeshellcmd.md",
         "escaping-arguments.md",

slides/intro.md

@@ -0,0 +1,16 @@
+#### Executing System Commands
+
+<dl>
+	<dt class="fragment" data-fragment-index="0"><code>exec()</code></dt>
+	<dd class="fragment" data-fragment-index="0">Returns the last line of output as a string.</dd>
+	<dt class="fragment" data-fragment-index="1"><code>shell_exec()</code></dt>
+	<dd class="fragment" data-fragment-index="1">returns <strong>full</strong> output as a string.</dd>
+	<dd class="fragment" data-fragment-index="2">Can also be represented using the backtick operator:
+		<pre><code class="lang-php">\`ls -al` === shell_exec('ls -al')</code></pre>
+	</dd>
+</dl>
+
+
+Note:
+
+If you require multiple lines of output, use shell_exec()