netdev keynote: minor formatting fixes, PDF export

3 files changed, 15 insertions, 20 deletions

diff --git a/2017/netfilter-netdev2.2/netdev2.2-welte-18_years_of_netfilter.pdf b/2017/netfilter-netdev2.2/netdev2.2-welte-18_years_of_netfilter.pdf
new file mode 100644
index 0000000..b69fee9
--- /dev/null
+++ b/2017/netfilter-netdev2.2/netdev2.2-welte-18_years_of_netfilter.pdf
diff --git a/2017/netfilter-netdev2.2/netfilter-keynote.adoc b/2017/netfilter-netdev2.2/netfilter-keynote.adoc
index 2987d9b..ad4bc9c 100644
--- a/2017/netfilter-netdev2.2/netfilter-keynote.adoc
+++ b/2017/netfilter-netdev2.2/netfilter-keynote.adoc
@@ -64,15 +64,12 @@ From: Paul Rusty Russell <Paul.Russell@rustcorp.com.au>
 Subject: [ipchains-dev] netfilter v0.1 released.
 
 Hi all,
-
-Just in case people are sick of all this "stable kernel" crap, and want their interesting behaviour back, here's the first alpha-quality cut of my new firewall/NAT/masquerading/transproxy/redirect/portforward framework, from
-        ftp://ftp.rustcorp.com/netfilter/netfilter-1999-01-29.tar.bz2
+Just in case people are sick of all this "stable kernel" crap, and want their interesting behaviour back, here's the first alpha-quality cut of my new firewall/NAT/masquerading/ transproxy/redirect/portforward framework, from [...]
 
 This work is a result of the vast amount of user feedback I've had on things such as transparent proxying, masquerading, ipfwadm, ipchains, etc.  Includes a 400k patch against 2.2.0. (84 files changed, 2509 insertions, 12097 deletions).
 
 It's all set in slush at this stage, so if you have any comments, please feel free to leap forward and abuse me...
 ----
-
 In other news of January 1999:
 
 * Yahoo bought Geocities
@@ -104,15 +101,15 @@ In other news:
 
 == Rusty (at Linux Beer Hike 2000)
 
-image:rusty2000.jpg[]
+image:rusty2000.jpg[width="80%"]
 
 == Linux Beer Hike 2000
 
-image:lbw1.jpg[width="100%"]
+image:lbw1.jpg[width="80%"]
 
 == Linux Beer Hike 2000
 
-image:lbw2.jpg[width="100%"]
+image:lbw2.jpg[width="80%"]
 
 == Marc Boucher (at OLS 2000)
 
@@ -173,7 +170,7 @@ Meanwhile, in other news:
 
 == 2000: Harald Welte
 
-image:laforge-hat.jpg[]
+image:laforge-hat.jpg[width="50%"]
 
 * active in German BBS community and pre-internet offline e-mail networking
 * sysadmin work at first German _online bistro_ later turning into first _internet cafe_
@@ -729,7 +726,7 @@ image:unix-extinguisher-2005.jpg[]
 
 == Workshop 2013
 
-image:nfws2013.jpg[width="100%"]
+image:nfws2013.jpg[width="85%"]
 
 * 2011: Kernel 3.0 is released, with netfilter/iptables
 
@@ -745,7 +742,7 @@ image:nfws2015.jpg[width="100%"]
 
 == Workshop 2016
 
-image:nfws2016.jpg[width="100%"]
+image:nfws2016.jpg[width="90%"]
 
 
 == Interesting Challenges
diff --git a/2017/netfilter-netdev2.2/netfilter-keynote.html b/2017/netfilter-netdev2.2/netfilter-keynote.html
index 47e8929..7c72877 100644
--- a/2017/netfilter-netdev2.2/netfilter-keynote.html
+++ b/2017/netfilter-netdev2.2/netfilter-keynote.html
@@ -5,7 +5,7 @@
 <title>netfilter archeology: 18 years from 2.3 to 4.x</title>

 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />

 <meta name="copyright" content="Copyright &#169; 2017 by Harald Welte (License: CC-BY-SA)" />

-<meta name="generator" content="AsciiDoc 8.6.9" />

+<meta name="generator" content="AsciiDoc 8.6.10" />

 <style type="text/css">

 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */

 

@@ -4025,9 +4025,7 @@ From: Paul Rusty Russell &lt;Paul.Russell@rustcorp.com.au&gt;
 Subject: [ipchains-dev] netfilter v0.1 released.

 

 Hi all,

-

-Just in case people are sick of all this "stable kernel" crap, and want their interesting behaviour back, here's the first alpha-quality cut of my new firewall/NAT/masquerading/transproxy/redirect/portforward framework, from

-        ftp://ftp.rustcorp.com/netfilter/netfilter-1999-01-29.tar.bz2

+Just in case people are sick of all this "stable kernel" crap, and want their interesting behaviour back, here's the first alpha-quality cut of my new firewall/NAT/masquerading/ transproxy/redirect/portforward framework, from [...]

 

 This work is a result of the vast amount of user feedback I've had on things such as transparent proxying, masquerading, ipfwadm, ipchains, etc.  Includes a 400k patch against 2.2.0. (84 files changed, 2509 insertions, 12097 deletions).

 

@@ -4086,7 +4084,7 @@ Vladimir Putin becomes Prime Minister of Russia for the first time
 <h1 id="_rusty_at_linux_beer_hike_2000">Rusty (at Linux Beer Hike 2000)</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="rusty2000.jpg" alt="rusty2000.jpg" />

+<img src="rusty2000.jpg" alt="rusty2000.jpg" width="80%" />

 </span></p></div>

 </div>

 </div>

@@ -4094,7 +4092,7 @@ Vladimir Putin becomes Prime Minister of Russia for the first time
 <h1 id="_linux_beer_hike_2000">Linux Beer Hike 2000</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="lbw1.jpg" alt="lbw1.jpg" width="100%" />

+<img src="lbw1.jpg" alt="lbw1.jpg" width="80%" />

 </span></p></div>

 </div>

 </div>

@@ -4102,7 +4100,7 @@ Vladimir Putin becomes Prime Minister of Russia for the first time
 <h1 id="_linux_beer_hike_2000_2">Linux Beer Hike 2000</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="lbw2.jpg" alt="lbw2.jpg" width="100%" />

+<img src="lbw2.jpg" alt="lbw2.jpg" width="80%" />

 </span></p></div>

 </div>

 </div>

@@ -4230,7 +4228,7 @@ Bill Gates steps down as CEO of Microsoft
 <h1 id="_2000_harald_welte">2000: Harald Welte</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="laforge-hat.jpg" alt="laforge-hat.jpg" />

+<img src="laforge-hat.jpg" alt="laforge-hat.jpg" width="50%" />

 </span></p></div>

 <ul class="">

 <li>

@@ -5322,7 +5320,7 @@ sponsors typically among commercial netfilter users
 <h1 id="_workshop_2013">Workshop 2013</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="nfws2013.jpg" alt="nfws2013.jpg" width="100%" />

+<img src="nfws2013.jpg" alt="nfws2013.jpg" width="85%" />

 </span></p></div>

 <ul class="">

 <li>

@@ -5360,7 +5358,7 @@ Kernel 4.0 is relesaed, with netfilter/iptables and nftables
 <h1 id="_workshop_2016">Workshop 2016</h1>

 <div class="sectionbody" style="max-width:45em">

 <div class="paragraph"><p><span class="image">

-<img src="nfws2016.jpg" alt="nfws2016.jpg" width="100%" />

+<img src="nfws2016.jpg" alt="nfws2016.jpg" width="90%" />

 </span></p></div>

 </div>

 </div>