Add Red Hat logos to slide templates.

Add header/footer-less slide variant for slides needed an extra bit of space.
Start getting slides ready for linux.conf.au 2006 tutorial, updating for cairo 1.0 API, and adding better organization. Verify and fix all the little example shell programs.
Really remove the building of the
-pdf programs this time.

7 files changed, 1182 insertions, 29 deletions

diff --git a/doc/tutorial/slides/cairo-blank.svg b/doc/tutorial/slides/cairo-blank.svg
index 881198110..b2f3f829d 100644
--- a/doc/tutorial/slides/cairo-blank.svg
+++ b/doc/tutorial/slides/cairo-blank.svg
@@ -481,7 +481,7 @@
     </g>
     
     <!-- Footer -->
-    <text ss:variable="URL" x="1016" y="760" text-anchor="end" font-size="20">http://cairographics.org</text>
+    <text ss:variable="URL" x="1016" y="753" text-anchor="end" font-size="20">http://cairographics.org</text>
   </g>
 
 </svg>
diff --git a/doc/tutorial/slides/cairo-code.svg b/doc/tutorial/slides/cairo-code.svg
index 297d4c742..c005324d1 100644
--- a/doc/tutorial/slides/cairo-code.svg
+++ b/doc/tutorial/slides/cairo-code.svg
@@ -450,6 +450,368 @@
 		    <g id="bullet">
 		      <use x="0" y="0" xlink:href="#cairo_logo" transform="translate(-6,-2) scale(0.1, 0.1)"/>>
 		    </g>
+		    <g id="redhat_logo_horizontal">
+		      <!-- 380x125 Red Hat log (horizontal layout) -->
+                      <g fill="black" stroke="none" 
+                       transform="translate(0,124),scale(1,-1),translate(-214,-258)"
+                       fill-rule="evenodd"
+                      >
+			<!-- r -->
+			<path fill="black" d="
+			 M 367.0625 315.3203
+			 C 367.0625 320.8765 366.9463 324.9644 366.7227 328.6597
+			 L 375.811 328.6597
+			 L 376.2002 320.7764
+			 L 376.4971 320.7764
+			 C 378.5391 326.6221 383.3809 329.5996 387.8594 329.5996
+			 C 388.8843 329.5996 389.4824 329.5601 390.3218 329.373
+			 L 390.3218 319.4863
+			 C 389.3398 319.6763 388.4224 319.7842 387.1592 319.7842
+			 C 382.1597 319.7842 378.688 316.6006 377.751 311.8447
+			 C 377.5732 310.918 377.4805 309.8086 377.4805 308.6777
+			 L 377.4805 287.1504
+			 L 366.9766 287.1504
+			 L 367.0625 315.3203
+			" />
+
+			<!-- e -->
+			<path fill="black" d="
+			 M 402.9927 305.0791
+			 C 403.2715 297.5586 409.0918 294.2695 415.814 294.2695
+			 C 420.6406 294.2695 424.0942 295.0234 427.2681 296.1924
+			 L 428.8232 288.9678
+			 C 425.269 287.4629 420.3413 286.3359 414.3149 286.3359
+			 C 400.8384 286.3359 392.9409 294.6592 392.9409 307.3809
+			 C 392.9409 318.8369 399.8911 329.6772 413.2437 329.6772
+			 C 426.7397 329.6772 431.1338 318.5771 431.1338 309.4893
+			 C 431.1338 307.5381 430.9624 305.9707 430.7593 305.0059
+			 L 402.9927 305.0791
+
+			 M 421.2485 312.3926
+			 C 421.2954 316.2388 419.6206 322.5088 412.5903 322.5088
+			 C 406.1299 322.5088 403.4438 316.645 402.9722 312.3926
+			 L 421.2485 312.3926
+			" />
+
+			<!-- d -->
+			<path fill="black" d="
+			 M 476.355 344.667
+			 L 465.8638 347.5083
+			 L 465.8638 324.1914
+			 L 465.6904 324.1914
+			 C 463.8335 327.2563 459.7407 329.5996 454.0571 329.5996
+			 C 444.0762 329.5996 435.3828 321.3374 435.4478 307.4307
+			 C 435.4478 294.6719 443.2983 286.2168 453.2119 286.2168
+			 C 459.2017 286.2168 464.2114 289.0723 466.6909 293.7217
+			 L 466.8779 293.7217
+			 L 467.3491 287.1504
+			 L 476.6997 287.1504
+			 C 476.5083 289.9717 476.355 294.543 476.355 298.792
+			 L 476.355 344.667
+
+			 M 465.8638 305.1504
+			 C 465.8638 304.0479 465.7856 303.0234 465.5454 302.0869
+			 C 464.4873 297.5439 460.7734 294.6172 456.4819 294.6172
+			 C 449.8721 294.6172 446.0903 300.1885 446.0903 307.8164
+			 C 446.0903 315.5166 449.8384 321.4761 456.6016 321.4761
+			 C 461.3208 321.4761 464.6992 318.1484 465.6274 314.1064
+			 C 465.8071 313.2559 465.8638 312.208 465.8638 311.3711
+			 L 465.8638 305.1504
+			" />
+
+			<!-- h -->
+			<path fill="black" d="
+			 M 503.7964 329.0176
+			 C 500.6836 329.0176 497.8926 328.1187 495.5493 326.6714
+			 C 493.1162 325.2461 491.1353 323.0464 489.959 320.7666
+			 L 489.7915 320.7666
+			 L 489.7915 341.0195
+			 L 485.7427 342.1226
+			 L 485.7427 287.1504
+			 L 489.7915 287.1504
+			 L 489.7915 312.1787
+			 C 489.7915 313.8408 489.9204 314.9946 490.3462 316.2109
+			 C 492.0928 321.3013 496.8896 325.4805 502.689 325.4805
+			 C 511.0664 325.4805 513.9673 318.7603 513.9673 311.3906
+			 L 513.9673 287.1504
+			 L 518.0137 287.1504
+			 L 518.0137 311.8359
+			 C 518.0137 327.0791 507.6753 329.0176 503.7964 329.0176
+			" />
+
+			<!-- a -->
+			<path fill="black" d="
+			 M 554.3413 296.873
+			 C 554.3413 293.6357 554.4692 290.2832 554.9375 287.1504
+			 L 551.2085 287.1504
+			 L 550.6128 293.0156
+			 L 550.4209 293.0156
+			 C 548.438 289.8594 543.8765 286.2168 537.3726 286.2168
+			 C 529.1392 286.2168 525.3057 292.0117 525.3057 297.4688
+			 C 525.3057 306.9121 533.6421 312.6064 550.292 312.4321
+			 L 550.292 313.5234
+			 C 550.292 317.5718 549.5044 325.6475 539.8242 325.5859
+			 C 536.2446 325.5859 532.5132 324.6255 529.5513 322.5366
+			 L 528.2632 325.4805
+			 C 532.0015 328.0137 536.5659 329.0176 540.2705 329.0176
+			 C 552.0801 329.0176 554.3413 320.1509 554.3413 312.8379
+			 L 554.3413 296.873
+
+			 M 550.292 309.0234
+			 C 541.3813 309.2813 529.6128 307.9336 529.6128 298.1055
+			 C 529.6128 292.2246 533.4946 289.5811 537.7578 289.5811
+			 C 544.5796 289.5811 548.4561 293.8018 549.8677 297.7871
+			 C 550.1646 298.6621 550.292 299.5371 550.292 300.2402
+			 L 550.292 309.0234
+			" />
+
+			<!-- t -->
+			<path fill="black" d="
+			 M 570.459 337.0996
+			 L 570.459 328.0801
+			 L 582.1235 328.0801
+			 L 582.1235 324.7959
+			 L 570.459 324.7959
+			 L 570.459 298.1943
+			 C 570.459 292.9912 572.0757 289.7285 576.4692 289.7285
+			 C 578.5815 289.7285 580.0757 290.0078 581.1206 290.3711
+			 L 581.6099 287.2354
+			 C 580.2871 286.6836 578.4302 286.2539 575.9619 286.2539
+			 C 572.9741 286.2539 570.4995 287.1934 568.8994 289.1543
+			 C 567.0469 291.3057 566.4116 294.7412 566.4116 298.916
+			 L 566.4116 324.7959
+			 L 559.5059 324.7959
+			 L 559.5059 328.0801
+			 L 566.4116 328.0801
+			 L 566.4116 335.606
+			 L 570.459 337.0996
+			" />
+
+			<!-- ® for 'redhat' -->
+			<path fill="black" d="
+			 M 335.5 288.9707
+			 L 336.0352 288.9707
+			 L 336.8408 287.6445
+			 L 337.3608 287.6445
+			 L 336.4888 288.9937
+			 C 336.9404 289.0498 337.2832 289.2881 337.2832 289.834
+			 C 337.2832 290.4385 336.9258 290.7051 336.2017 290.7051
+			 L 335.0366 290.7051
+			 L 335.0366 287.6445
+			 L 335.5 287.6445
+			 L 335.5 288.9707
+
+			 M 335.5 289.3643
+			 L 335.5 290.3101
+			 L 336.1318 290.3101
+			 C 336.4531 290.3101 336.7979 290.2402 336.7979 289.8647
+			 C 336.7979 289.3916 336.4492 289.3643 336.0566 289.3643
+			 L 335.5 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 339.0439 289.1719
+			 C 339.0439 287.5176 337.7041 286.1763 336.0493 286.1763
+			 C 334.395 286.1763 333.0527 287.5176 333.0527 289.1719
+			 C 333.0527 290.8271 334.395 292.1675 336.0493 292.1675
+			 C 337.7041 292.1675 339.0439 290.8271 339.0439 289.1719
+
+			 M 336.0493 291.6367
+			 C 334.6865 291.6367 333.5835 290.5332 333.5835 289.1719
+			 C 333.5835 287.8096 334.6865 286.7061 336.0493 286.7061
+			 C 337.4082 286.7061 338.5117 287.8096 338.5117 289.1719
+			 C 338.5117 290.5332 337.4082 291.6367 336.0493 291.6367
+			" />
+
+			<!-- Black background behind The Shadowman -->
+			<path fill="black" d="
+			 M 326.4531 286.208
+			 C 324.1177 286.7451 321.6396 287.0801 319.1338 287.0801
+			 C 314.8496 287.0801 310.9502 286.3389 308.0732 285.1426
+			 C 307.7559 284.9844 307.5303 284.6533 307.5303 284.2764
+			 C 307.5303 284.1406 307.5654 283.999 307.6172 283.8838
+			 C 307.957 282.8975 307.3984 281.8281 304.6157 281.2158
+			 C 300.4883 280.3096 297.8833 276.0527 296.3916 274.6367
+			 C 294.6411 272.9756 289.6973 271.9531 290.4404 272.9434
+			 C 291.0225 273.7188 293.2485 276.1348 294.6016 278.748
+			 C 295.8125 281.083 296.8906 281.7461 298.375 283.9736
+			 C 298.811 284.627 300.4995 286.9219 300.9912 288.7373
+			 C 301.543 290.5107 301.356 292.7344 301.5679 293.6494
+			 C 301.8721 294.9697 303.1182 297.8369 303.2129 299.4531
+			 C 303.2666 300.3691 299.3916 298.1494 297.5532 298.1494
+			 C 295.7144 298.1494 293.9233 299.248 292.2808 299.3281
+			 C 290.248 299.4248 288.9414 297.7607 287.1025 298.0508
+			 C 286.0518 298.2178 285.167 299.1426 283.3311 299.2129
+			 C 280.7178 299.3086 277.5244 297.7607 271.5264 297.9531
+			 C 265.6255 298.1436 260.1753 305.4082 259.4312 306.5635
+			 C 258.5605 307.9199 257.4961 307.9199 256.335 306.8555
+			 C 255.1738 305.792 253.7432 306.627 253.3359 307.3389
+			 C 252.5615 308.6943 250.4927 312.6543 247.2881 313.4824
+			 C 242.8564 314.6309 240.6118 311.0283 240.9033 308.1621
+			 C 241.1987 305.252 243.0801 304.4375 243.9512 302.8906
+			 C 244.8213 301.3428 245.2671 300.3428 246.9053 299.6572
+			 C 248.0674 299.1758 248.5 298.458 248.1533 297.5049
+			 C 247.8506 296.6738 246.6416 296.4834 245.8477 296.4463
+			 C 244.1592 296.3662 242.9756 296.8242 242.1123 297.376
+			 C 241.1084 298.0137 240.292 298.9033 239.416 300.4131
+			 C 238.4023 302.0781 236.8052 302.8037 234.9453 302.8037
+			 C 234.0586 302.8037 233.2295 302.5693 232.4922 302.1895
+			 C 229.5771 300.6748 226.1064 299.7744 222.3706 299.7744
+			 L 218.1572 299.7734
+			 C 216.1064 305.8555 214.9951 312.3682 214.9951 319.1416
+			 C 214.9951 352.6064 242.1226 379.7334 275.5859 379.7334
+			 C 309.0498 379.7334 336.1758 352.6064 336.1758 319.1416
+			 C 336.1758 307 332.6035 295.6895 326.4531 286.208
+			" />
+
+			<!-- The Shadowman's face -->
+			<path fill="white" d="
+			 M 326.4531 286.209
+			 C 324.1177 286.7461 321.6396 287.084 319.1338 287.084
+			 C 314.8496 287.084 310.9502 286.3418 308.0732 285.1436
+			 C 307.7559 284.9873 307.5303 284.6553 307.5303 284.2783
+			 C 307.5303 284.1416 307.5654 284.001 307.6172 283.8838
+			 C 307.957 282.8994 307.3984 281.8311 304.6157 281.2178
+			 C 300.4883 280.3115 297.8833 276.0537 296.3916 274.6416
+			 C 294.6411 272.9766 289.6973 271.9551 290.4404 272.9463
+			 C 291.0225 273.7197 293.2485 276.1367 294.6016 278.749
+			 C 295.8125 281.083 296.8906 281.75 298.375 283.9756
+			 C 298.811 284.627 300.4995 286.9238 300.9912 288.7402
+			 C 301.543 290.5117 301.356 292.7354 301.5679 293.6514
+			 C 301.8721 294.9727 303.1182 297.8379 303.2129 299.457
+			 C 303.2666 300.3721 299.3916 298.1504 297.5532 298.1504
+			 C 295.7144 298.1504 293.9233 299.251 292.2808 299.3301
+			 C 290.248 299.4258 288.9414 297.7627 287.1025 298.0518
+			 C 286.0518 298.2207 285.167 299.1465 283.3311 299.2148
+			 C 280.7178 299.3096 277.5244 297.7627 271.5264 297.9561
+			 C 265.6255 298.1475 260.1753 305.4121 259.4312 306.5674
+			 C 258.5605 307.9219 257.4961 307.9219 256.335 306.8574
+			 C 255.1738 305.7939 253.7432 306.6299 253.3359 307.3438
+			 C 252.5615 308.6963 250.4927 312.6553 247.2881 313.4854
+			 C 242.8564 314.6338 240.6118 311.0313 240.9033 308.1641
+			 C 241.1987 305.2539 243.0801 304.4395 243.9512 302.8926
+			 C 244.8213 301.3438 245.2671 300.3457 246.9053 299.6621
+			 C 248.0674 299.1768 248.5 298.4609 248.1533 297.5068
+			 C 247.8506 296.6768 246.6416 296.4873 245.8477 296.4492
+			 C 244.1592 296.3672 242.9756 296.8262 242.1123 297.376
+			 C 241.1084 298.0176 240.292 298.9043 239.416 300.416
+			 C 238.4023 302.0801 236.8052 302.8086 234.9453 302.8086
+			 C 234.0586 302.8086 233.2295 302.5723 232.4922 302.1934
+			 C 229.5771 300.6748 226.1064 299.7773 222.3706 299.7773
+			 L 218.1572 299.7744
+			 C 226.2363 275.8105 248.8965 258.5527 275.5859 258.5527
+			 C 296.9063 258.5527 315.6538 269.5635 326.4531 286.209
+			" />
+
+			<!-- nose shadow -->
+			<path fill="black" d="
+			 M 288.9307 291.7637
+			 C 289.2422 291.46 289.7793 290.4375 289.1226 289.1396
+			 C 288.7544 288.4521 288.3579 287.9678 287.6489 287.4023
+			 C 286.7969 286.7188 285.1309 285.9307 282.8457 287.3799
+			 C 281.6172 288.1592 281.543 288.4209 279.8467 288.2012
+			 C 278.6348 288.043 278.1533 289.2656 278.5884 290.2832
+			 C 279.0244 291.2969 280.8145 292.1191 283.04 290.8135
+			 C 284.041 290.2256 285.6025 288.9844 286.9688 290.084
+			 C 287.5356 290.5381 287.875 290.8408 288.6611 291.75
+			 C 288.6963 291.7881 288.7461 291.8105 288.8018 291.8105
+			 C 288.8516 291.8105 288.8965 291.793 288.9307 291.7637
+			" />
+
+			<!-- The Shadowman's red hat -->
+			<path fill="#cc0000" d="
+			 M 309.7769 335.2627
+			 C 309.1787 333.251 308.3271 330.6763 304.5391 328.7314
+			 C 303.9878 328.4497 303.7764 328.9126 304.0313 329.3477
+			 C 305.4629 331.7832 305.7168 332.3921 306.1328 333.3525
+			 C 306.7148 334.7568 307.02 336.7549 305.8618 340.9219
+			 C 303.5835 349.1221 298.8296 360.083 295.375 363.6392
+			 C 292.04 367.0698 285.998 368.0361 280.5371 366.6348
+			 C 278.5264 366.1191 274.5918 364.0732 267.2939 365.7168
+			 C 254.665 368.5605 252.7939 362.2368 252.0693 359.4824
+			 C 251.3438 356.7271 249.6045 348.897 249.6045 348.897
+			 C 249.0244 345.7085 248.2646 340.1631 267.874 336.4287
+			 C 277.0088 334.6885 277.4736 332.3276 277.8779 330.6289
+			 C 278.603 327.585 279.7627 325.8438 281.0674 324.9746
+			 C 282.373 324.1035 281.0674 323.3828 279.6187 323.2349
+			 C 275.7285 322.8311 261.3491 326.9541 252.8428 331.7881
+			 C 245.8828 336.0415 245.7656 339.8721 247.3584 343.1211
+			 C 236.8452 344.2573 228.9561 342.1348 227.5254 337.1582
+			 C 225.0693 328.6157 246.3047 314.0264 270.4839 306.7061
+			 C 295.8579 299.0225 321.9556 304.3857 324.8564 320.335
+			 C 326.1738 327.5811 320.0713 332.9419 309.7769 335.2627
+			" />
+
+			<!-- shadow on hat -->
+			<path fill="black" d="
+			 M 270.8711 350.8813
+			 C 263.8721 350.375 263.145 349.6191 261.834 348.2227
+			 C 259.9854 346.2539 257.5508 350.7773 257.5508 350.7773
+			 C 256.0898 351.085 254.3179 353.4404 255.2744 355.6411
+			 C 256.2158 357.8174 257.9551 357.1641 258.5 356.4868
+			 C 259.1626 355.6621 260.5771 354.3125 262.4141 354.3613
+			 C 264.251 354.4097 266.3706 354.7959 269.3262 354.7959
+			 C 272.3213 354.7959 274.335 353.6777 274.4487 352.7168
+			 C 274.5459 351.8965 274.2061 351.1226 270.8711 350.8813
+			" />
+
+			<!-- another shadow on hat -->
+			<path fill="black" d="
+			 M 278.2236 362.4463
+			 C 278.2129 362.4453 278.2021 362.4438 278.1919 362.4438
+			 C 278.084 362.4438 277.9961 362.5273 277.9961 362.6274
+			 C 277.9961 362.7007 278.041 362.7646 278.106 362.7939
+			 C 279.4629 363.5107 281.4873 364.0811 283.8042 364.3169
+			 C 284.499 364.3887 285.1787 364.4248 285.832 364.4307
+			 C 285.9478 364.4307 286.0615 364.4297 286.1787 364.4277
+			 C 290.062 364.3398 293.1719 362.7974 293.1255 360.9814
+			 C 293.0791 359.165 289.8955 357.7637 286.0112 357.8506
+			 C 284.7529 357.8794 283.5732 358.0615 282.5576 358.3545
+			 C 282.4385 358.3857 282.3506 358.4883 282.3506 358.6094
+			 C 282.3506 358.731 282.4385 358.834 282.5605 358.8638
+			 C 284.9839 359.4248 286.6191 360.3408 286.5039 361.207
+			 C 286.3511 362.3545 283.1816 362.979 279.4248 362.6011
+			 C 279.0137 362.5596 278.6118 362.5068 278.2236 362.4463
+			" />
+
+			<!-- ® for The Shadowman -->
+			<path fill="black" d="
+			 M 588.3018 288.9707
+			 L 588.8369 288.9707
+			 L 589.6426 287.6445
+			 L 590.1626 287.6445
+			 L 589.2905 288.9937
+			 C 589.7422 289.0498 590.085 289.2881 590.085 289.834
+			 C 590.085 290.4385 589.7275 290.7051 589.0034 290.7051
+			 L 587.8384 290.7051
+			 L 587.8384 287.6445
+			 L 588.3018 287.6445
+			 L 588.3018 288.9707
+
+			 M 588.3018 289.3643
+			 L 588.3018 290.3101
+			 L 588.9336 290.3101
+			 C 589.2549 290.3101 589.5996 290.2402 589.5996 289.8647
+			 C 589.5996 289.3916 589.251 289.3643 588.8584 289.3643
+			 L 588.3018 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 591.8457 289.1719
+			 C 591.8457 287.5176 590.5059 286.1763 588.8511 286.1763
+			 C 587.1968 286.1763 585.8545 287.5176 585.8545 289.1719
+			 C 585.8545 290.8271 587.1968 292.1675 588.8511 292.1675
+			 C 590.5059 292.1675 591.8457 290.8271 591.8457 289.1719
+
+			 M 588.8511 291.6367
+			 C 587.4883 291.6367 586.3853 290.5332 586.3853 289.1719
+			 C 586.3853 287.8096 587.4883 286.7061 588.8511 286.7061
+			 C 590.21 286.7061 591.3135 287.8096 591.3135 289.1719
+			 C 591.3135 290.5332 590.21 291.6367 588.8511 291.6367
+			" />
+
+		      </g>
+		    </g>
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
@@ -470,6 +832,9 @@
   <!-- freedesktop.org logo at upper-right -->
   <use xlink:href="#freedesktop_org_logo" transform="translate(910, 12)" />
 
+  <!-- Red Hat logo at lower-left -->
+  <use xlink:href="#redhat_logo_horizontal" transform="translate(8,768),scale(.5,.5),translate(0, -125)" />
+
   <g font-family="Frutiger">
     <!-- Slide title -->
     <g id="slide_title" transform="translate(512, 138)">
@@ -502,7 +867,7 @@
     </g>
     
     <!-- Footer -->
-    <text ss:variable="URL" x="1016" y="760" text-anchor="end" font-size="20">http://cairographics.org</text>
+    <text ss:variable="URL" x="1016" y="753" text-anchor="end" font-size="20">http://cairographics.org</text>
   </g>
 
 </svg>
diff --git a/doc/tutorial/slides/cairo-separator.svg b/doc/tutorial/slides/cairo-separator.svg
index 4fe417643..abee6c147 100644
--- a/doc/tutorial/slides/cairo-separator.svg
+++ b/doc/tutorial/slides/cairo-separator.svg
@@ -450,6 +450,368 @@
 		    <g id="bullet">
 		      <use x="0" y="0" xlink:href="#cairo_logo" transform="translate(-6,-2) scale(0.1, 0.1)"/>>
 		    </g>
+		    <g id="redhat_logo_horizontal">
+		      <!-- 380x125 Red Hat log (horizontal layout) -->
+                      <g fill="black" stroke="none" 
+                       transform="translate(0,124),scale(1,-1),translate(-214,-258)"
+                       fill-rule="evenodd"
+                      >
+			<!-- r -->
+			<path fill="black" d="
+			 M 367.0625 315.3203
+			 C 367.0625 320.8765 366.9463 324.9644 366.7227 328.6597
+			 L 375.811 328.6597
+			 L 376.2002 320.7764
+			 L 376.4971 320.7764
+			 C 378.5391 326.6221 383.3809 329.5996 387.8594 329.5996
+			 C 388.8843 329.5996 389.4824 329.5601 390.3218 329.373
+			 L 390.3218 319.4863
+			 C 389.3398 319.6763 388.4224 319.7842 387.1592 319.7842
+			 C 382.1597 319.7842 378.688 316.6006 377.751 311.8447
+			 C 377.5732 310.918 377.4805 309.8086 377.4805 308.6777
+			 L 377.4805 287.1504
+			 L 366.9766 287.1504
+			 L 367.0625 315.3203
+			" />
+
+			<!-- e -->
+			<path fill="black" d="
+			 M 402.9927 305.0791
+			 C 403.2715 297.5586 409.0918 294.2695 415.814 294.2695
+			 C 420.6406 294.2695 424.0942 295.0234 427.2681 296.1924
+			 L 428.8232 288.9678
+			 C 425.269 287.4629 420.3413 286.3359 414.3149 286.3359
+			 C 400.8384 286.3359 392.9409 294.6592 392.9409 307.3809
+			 C 392.9409 318.8369 399.8911 329.6772 413.2437 329.6772
+			 C 426.7397 329.6772 431.1338 318.5771 431.1338 309.4893
+			 C 431.1338 307.5381 430.9624 305.9707 430.7593 305.0059
+			 L 402.9927 305.0791
+
+			 M 421.2485 312.3926
+			 C 421.2954 316.2388 419.6206 322.5088 412.5903 322.5088
+			 C 406.1299 322.5088 403.4438 316.645 402.9722 312.3926
+			 L 421.2485 312.3926
+			" />
+
+			<!-- d -->
+			<path fill="black" d="
+			 M 476.355 344.667
+			 L 465.8638 347.5083
+			 L 465.8638 324.1914
+			 L 465.6904 324.1914
+			 C 463.8335 327.2563 459.7407 329.5996 454.0571 329.5996
+			 C 444.0762 329.5996 435.3828 321.3374 435.4478 307.4307
+			 C 435.4478 294.6719 443.2983 286.2168 453.2119 286.2168
+			 C 459.2017 286.2168 464.2114 289.0723 466.6909 293.7217
+			 L 466.8779 293.7217
+			 L 467.3491 287.1504
+			 L 476.6997 287.1504
+			 C 476.5083 289.9717 476.355 294.543 476.355 298.792
+			 L 476.355 344.667
+
+			 M 465.8638 305.1504
+			 C 465.8638 304.0479 465.7856 303.0234 465.5454 302.0869
+			 C 464.4873 297.5439 460.7734 294.6172 456.4819 294.6172
+			 C 449.8721 294.6172 446.0903 300.1885 446.0903 307.8164
+			 C 446.0903 315.5166 449.8384 321.4761 456.6016 321.4761
+			 C 461.3208 321.4761 464.6992 318.1484 465.6274 314.1064
+			 C 465.8071 313.2559 465.8638 312.208 465.8638 311.3711
+			 L 465.8638 305.1504
+			" />
+
+			<!-- h -->
+			<path fill="black" d="
+			 M 503.7964 329.0176
+			 C 500.6836 329.0176 497.8926 328.1187 495.5493 326.6714
+			 C 493.1162 325.2461 491.1353 323.0464 489.959 320.7666
+			 L 489.7915 320.7666
+			 L 489.7915 341.0195
+			 L 485.7427 342.1226
+			 L 485.7427 287.1504
+			 L 489.7915 287.1504
+			 L 489.7915 312.1787
+			 C 489.7915 313.8408 489.9204 314.9946 490.3462 316.2109
+			 C 492.0928 321.3013 496.8896 325.4805 502.689 325.4805
+			 C 511.0664 325.4805 513.9673 318.7603 513.9673 311.3906
+			 L 513.9673 287.1504
+			 L 518.0137 287.1504
+			 L 518.0137 311.8359
+			 C 518.0137 327.0791 507.6753 329.0176 503.7964 329.0176
+			" />
+
+			<!-- a -->
+			<path fill="black" d="
+			 M 554.3413 296.873
+			 C 554.3413 293.6357 554.4692 290.2832 554.9375 287.1504
+			 L 551.2085 287.1504
+			 L 550.6128 293.0156
+			 L 550.4209 293.0156
+			 C 548.438 289.8594 543.8765 286.2168 537.3726 286.2168
+			 C 529.1392 286.2168 525.3057 292.0117 525.3057 297.4688
+			 C 525.3057 306.9121 533.6421 312.6064 550.292 312.4321
+			 L 550.292 313.5234
+			 C 550.292 317.5718 549.5044 325.6475 539.8242 325.5859
+			 C 536.2446 325.5859 532.5132 324.6255 529.5513 322.5366
+			 L 528.2632 325.4805
+			 C 532.0015 328.0137 536.5659 329.0176 540.2705 329.0176
+			 C 552.0801 329.0176 554.3413 320.1509 554.3413 312.8379
+			 L 554.3413 296.873
+
+			 M 550.292 309.0234
+			 C 541.3813 309.2813 529.6128 307.9336 529.6128 298.1055
+			 C 529.6128 292.2246 533.4946 289.5811 537.7578 289.5811
+			 C 544.5796 289.5811 548.4561 293.8018 549.8677 297.7871
+			 C 550.1646 298.6621 550.292 299.5371 550.292 300.2402
+			 L 550.292 309.0234
+			" />
+
+			<!-- t -->
+			<path fill="black" d="
+			 M 570.459 337.0996
+			 L 570.459 328.0801
+			 L 582.1235 328.0801
+			 L 582.1235 324.7959
+			 L 570.459 324.7959
+			 L 570.459 298.1943
+			 C 570.459 292.9912 572.0757 289.7285 576.4692 289.7285
+			 C 578.5815 289.7285 580.0757 290.0078 581.1206 290.3711
+			 L 581.6099 287.2354
+			 C 580.2871 286.6836 578.4302 286.2539 575.9619 286.2539
+			 C 572.9741 286.2539 570.4995 287.1934 568.8994 289.1543
+			 C 567.0469 291.3057 566.4116 294.7412 566.4116 298.916
+			 L 566.4116 324.7959
+			 L 559.5059 324.7959
+			 L 559.5059 328.0801
+			 L 566.4116 328.0801
+			 L 566.4116 335.606
+			 L 570.459 337.0996
+			" />
+
+			<!-- ® for 'redhat' -->
+			<path fill="black" d="
+			 M 335.5 288.9707
+			 L 336.0352 288.9707
+			 L 336.8408 287.6445
+			 L 337.3608 287.6445
+			 L 336.4888 288.9937
+			 C 336.9404 289.0498 337.2832 289.2881 337.2832 289.834
+			 C 337.2832 290.4385 336.9258 290.7051 336.2017 290.7051
+			 L 335.0366 290.7051
+			 L 335.0366 287.6445
+			 L 335.5 287.6445
+			 L 335.5 288.9707
+
+			 M 335.5 289.3643
+			 L 335.5 290.3101
+			 L 336.1318 290.3101
+			 C 336.4531 290.3101 336.7979 290.2402 336.7979 289.8647
+			 C 336.7979 289.3916 336.4492 289.3643 336.0566 289.3643
+			 L 335.5 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 339.0439 289.1719
+			 C 339.0439 287.5176 337.7041 286.1763 336.0493 286.1763
+			 C 334.395 286.1763 333.0527 287.5176 333.0527 289.1719
+			 C 333.0527 290.8271 334.395 292.1675 336.0493 292.1675
+			 C 337.7041 292.1675 339.0439 290.8271 339.0439 289.1719
+
+			 M 336.0493 291.6367
+			 C 334.6865 291.6367 333.5835 290.5332 333.5835 289.1719
+			 C 333.5835 287.8096 334.6865 286.7061 336.0493 286.7061
+			 C 337.4082 286.7061 338.5117 287.8096 338.5117 289.1719
+			 C 338.5117 290.5332 337.4082 291.6367 336.0493 291.6367
+			" />
+
+			<!-- Black background behind The Shadowman -->
+			<path fill="black" d="
+			 M 326.4531 286.208
+			 C 324.1177 286.7451 321.6396 287.0801 319.1338 287.0801
+			 C 314.8496 287.0801 310.9502 286.3389 308.0732 285.1426
+			 C 307.7559 284.9844 307.5303 284.6533 307.5303 284.2764
+			 C 307.5303 284.1406 307.5654 283.999 307.6172 283.8838
+			 C 307.957 282.8975 307.3984 281.8281 304.6157 281.2158
+			 C 300.4883 280.3096 297.8833 276.0527 296.3916 274.6367
+			 C 294.6411 272.9756 289.6973 271.9531 290.4404 272.9434
+			 C 291.0225 273.7188 293.2485 276.1348 294.6016 278.748
+			 C 295.8125 281.083 296.8906 281.7461 298.375 283.9736
+			 C 298.811 284.627 300.4995 286.9219 300.9912 288.7373
+			 C 301.543 290.5107 301.356 292.7344 301.5679 293.6494
+			 C 301.8721 294.9697 303.1182 297.8369 303.2129 299.4531
+			 C 303.2666 300.3691 299.3916 298.1494 297.5532 298.1494
+			 C 295.7144 298.1494 293.9233 299.248 292.2808 299.3281
+			 C 290.248 299.4248 288.9414 297.7607 287.1025 298.0508
+			 C 286.0518 298.2178 285.167 299.1426 283.3311 299.2129
+			 C 280.7178 299.3086 277.5244 297.7607 271.5264 297.9531
+			 C 265.6255 298.1436 260.1753 305.4082 259.4312 306.5635
+			 C 258.5605 307.9199 257.4961 307.9199 256.335 306.8555
+			 C 255.1738 305.792 253.7432 306.627 253.3359 307.3389
+			 C 252.5615 308.6943 250.4927 312.6543 247.2881 313.4824
+			 C 242.8564 314.6309 240.6118 311.0283 240.9033 308.1621
+			 C 241.1987 305.252 243.0801 304.4375 243.9512 302.8906
+			 C 244.8213 301.3428 245.2671 300.3428 246.9053 299.6572
+			 C 248.0674 299.1758 248.5 298.458 248.1533 297.5049
+			 C 247.8506 296.6738 246.6416 296.4834 245.8477 296.4463
+			 C 244.1592 296.3662 242.9756 296.8242 242.1123 297.376
+			 C 241.1084 298.0137 240.292 298.9033 239.416 300.4131
+			 C 238.4023 302.0781 236.8052 302.8037 234.9453 302.8037
+			 C 234.0586 302.8037 233.2295 302.5693 232.4922 302.1895
+			 C 229.5771 300.6748 226.1064 299.7744 222.3706 299.7744
+			 L 218.1572 299.7734
+			 C 216.1064 305.8555 214.9951 312.3682 214.9951 319.1416
+			 C 214.9951 352.6064 242.1226 379.7334 275.5859 379.7334
+			 C 309.0498 379.7334 336.1758 352.6064 336.1758 319.1416
+			 C 336.1758 307 332.6035 295.6895 326.4531 286.208
+			" />
+
+			<!-- The Shadowman's face -->
+			<path fill="white" d="
+			 M 326.4531 286.209
+			 C 324.1177 286.7461 321.6396 287.084 319.1338 287.084
+			 C 314.8496 287.084 310.9502 286.3418 308.0732 285.1436
+			 C 307.7559 284.9873 307.5303 284.6553 307.5303 284.2783
+			 C 307.5303 284.1416 307.5654 284.001 307.6172 283.8838
+			 C 307.957 282.8994 307.3984 281.8311 304.6157 281.2178
+			 C 300.4883 280.3115 297.8833 276.0537 296.3916 274.6416
+			 C 294.6411 272.9766 289.6973 271.9551 290.4404 272.9463
+			 C 291.0225 273.7197 293.2485 276.1367 294.6016 278.749
+			 C 295.8125 281.083 296.8906 281.75 298.375 283.9756
+			 C 298.811 284.627 300.4995 286.9238 300.9912 288.7402
+			 C 301.543 290.5117 301.356 292.7354 301.5679 293.6514
+			 C 301.8721 294.9727 303.1182 297.8379 303.2129 299.457
+			 C 303.2666 300.3721 299.3916 298.1504 297.5532 298.1504
+			 C 295.7144 298.1504 293.9233 299.251 292.2808 299.3301
+			 C 290.248 299.4258 288.9414 297.7627 287.1025 298.0518
+			 C 286.0518 298.2207 285.167 299.1465 283.3311 299.2148
+			 C 280.7178 299.3096 277.5244 297.7627 271.5264 297.9561
+			 C 265.6255 298.1475 260.1753 305.4121 259.4312 306.5674
+			 C 258.5605 307.9219 257.4961 307.9219 256.335 306.8574
+			 C 255.1738 305.7939 253.7432 306.6299 253.3359 307.3438
+			 C 252.5615 308.6963 250.4927 312.6553 247.2881 313.4854
+			 C 242.8564 314.6338 240.6118 311.0313 240.9033 308.1641
+			 C 241.1987 305.2539 243.0801 304.4395 243.9512 302.8926
+			 C 244.8213 301.3438 245.2671 300.3457 246.9053 299.6621
+			 C 248.0674 299.1768 248.5 298.4609 248.1533 297.5068
+			 C 247.8506 296.6768 246.6416 296.4873 245.8477 296.4492
+			 C 244.1592 296.3672 242.9756 296.8262 242.1123 297.376
+			 C 241.1084 298.0176 240.292 298.9043 239.416 300.416
+			 C 238.4023 302.0801 236.8052 302.8086 234.9453 302.8086
+			 C 234.0586 302.8086 233.2295 302.5723 232.4922 302.1934
+			 C 229.5771 300.6748 226.1064 299.7773 222.3706 299.7773
+			 L 218.1572 299.7744
+			 C 226.2363 275.8105 248.8965 258.5527 275.5859 258.5527
+			 C 296.9063 258.5527 315.6538 269.5635 326.4531 286.209
+			" />
+
+			<!-- nose shadow -->
+			<path fill="black" d="
+			 M 288.9307 291.7637
+			 C 289.2422 291.46 289.7793 290.4375 289.1226 289.1396
+			 C 288.7544 288.4521 288.3579 287.9678 287.6489 287.4023
+			 C 286.7969 286.7188 285.1309 285.9307 282.8457 287.3799
+			 C 281.6172 288.1592 281.543 288.4209 279.8467 288.2012
+			 C 278.6348 288.043 278.1533 289.2656 278.5884 290.2832
+			 C 279.0244 291.2969 280.8145 292.1191 283.04 290.8135
+			 C 284.041 290.2256 285.6025 288.9844 286.9688 290.084
+			 C 287.5356 290.5381 287.875 290.8408 288.6611 291.75
+			 C 288.6963 291.7881 288.7461 291.8105 288.8018 291.8105
+			 C 288.8516 291.8105 288.8965 291.793 288.9307 291.7637
+			" />
+
+			<!-- The Shadowman's red hat -->
+			<path fill="#cc0000" d="
+			 M 309.7769 335.2627
+			 C 309.1787 333.251 308.3271 330.6763 304.5391 328.7314
+			 C 303.9878 328.4497 303.7764 328.9126 304.0313 329.3477
+			 C 305.4629 331.7832 305.7168 332.3921 306.1328 333.3525
+			 C 306.7148 334.7568 307.02 336.7549 305.8618 340.9219
+			 C 303.5835 349.1221 298.8296 360.083 295.375 363.6392
+			 C 292.04 367.0698 285.998 368.0361 280.5371 366.6348
+			 C 278.5264 366.1191 274.5918 364.0732 267.2939 365.7168
+			 C 254.665 368.5605 252.7939 362.2368 252.0693 359.4824
+			 C 251.3438 356.7271 249.6045 348.897 249.6045 348.897
+			 C 249.0244 345.7085 248.2646 340.1631 267.874 336.4287
+			 C 277.0088 334.6885 277.4736 332.3276 277.8779 330.6289
+			 C 278.603 327.585 279.7627 325.8438 281.0674 324.9746
+			 C 282.373 324.1035 281.0674 323.3828 279.6187 323.2349
+			 C 275.7285 322.8311 261.3491 326.9541 252.8428 331.7881
+			 C 245.8828 336.0415 245.7656 339.8721 247.3584 343.1211
+			 C 236.8452 344.2573 228.9561 342.1348 227.5254 337.1582
+			 C 225.0693 328.6157 246.3047 314.0264 270.4839 306.7061
+			 C 295.8579 299.0225 321.9556 304.3857 324.8564 320.335
+			 C 326.1738 327.5811 320.0713 332.9419 309.7769 335.2627
+			" />
+
+			<!-- shadow on hat -->
+			<path fill="black" d="
+			 M 270.8711 350.8813
+			 C 263.8721 350.375 263.145 349.6191 261.834 348.2227
+			 C 259.9854 346.2539 257.5508 350.7773 257.5508 350.7773
+			 C 256.0898 351.085 254.3179 353.4404 255.2744 355.6411
+			 C 256.2158 357.8174 257.9551 357.1641 258.5 356.4868
+			 C 259.1626 355.6621 260.5771 354.3125 262.4141 354.3613
+			 C 264.251 354.4097 266.3706 354.7959 269.3262 354.7959
+			 C 272.3213 354.7959 274.335 353.6777 274.4487 352.7168
+			 C 274.5459 351.8965 274.2061 351.1226 270.8711 350.8813
+			" />
+
+			<!-- another shadow on hat -->
+			<path fill="black" d="
+			 M 278.2236 362.4463
+			 C 278.2129 362.4453 278.2021 362.4438 278.1919 362.4438
+			 C 278.084 362.4438 277.9961 362.5273 277.9961 362.6274
+			 C 277.9961 362.7007 278.041 362.7646 278.106 362.7939
+			 C 279.4629 363.5107 281.4873 364.0811 283.8042 364.3169
+			 C 284.499 364.3887 285.1787 364.4248 285.832 364.4307
+			 C 285.9478 364.4307 286.0615 364.4297 286.1787 364.4277
+			 C 290.062 364.3398 293.1719 362.7974 293.1255 360.9814
+			 C 293.0791 359.165 289.8955 357.7637 286.0112 357.8506
+			 C 284.7529 357.8794 283.5732 358.0615 282.5576 358.3545
+			 C 282.4385 358.3857 282.3506 358.4883 282.3506 358.6094
+			 C 282.3506 358.731 282.4385 358.834 282.5605 358.8638
+			 C 284.9839 359.4248 286.6191 360.3408 286.5039 361.207
+			 C 286.3511 362.3545 283.1816 362.979 279.4248 362.6011
+			 C 279.0137 362.5596 278.6118 362.5068 278.2236 362.4463
+			" />
+
+			<!-- ® for The Shadowman -->
+			<path fill="black" d="
+			 M 588.3018 288.9707
+			 L 588.8369 288.9707
+			 L 589.6426 287.6445
+			 L 590.1626 287.6445
+			 L 589.2905 288.9937
+			 C 589.7422 289.0498 590.085 289.2881 590.085 289.834
+			 C 590.085 290.4385 589.7275 290.7051 589.0034 290.7051
+			 L 587.8384 290.7051
+			 L 587.8384 287.6445
+			 L 588.3018 287.6445
+			 L 588.3018 288.9707
+
+			 M 588.3018 289.3643
+			 L 588.3018 290.3101
+			 L 588.9336 290.3101
+			 C 589.2549 290.3101 589.5996 290.2402 589.5996 289.8647
+			 C 589.5996 289.3916 589.251 289.3643 588.8584 289.3643
+			 L 588.3018 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 591.8457 289.1719
+			 C 591.8457 287.5176 590.5059 286.1763 588.8511 286.1763
+			 C 587.1968 286.1763 585.8545 287.5176 585.8545 289.1719
+			 C 585.8545 290.8271 587.1968 292.1675 588.8511 292.1675
+			 C 590.5059 292.1675 591.8457 290.8271 591.8457 289.1719
+
+			 M 588.8511 291.6367
+			 C 587.4883 291.6367 586.3853 290.5332 586.3853 289.1719
+			 C 586.3853 287.8096 587.4883 286.7061 588.8511 286.7061
+			 C 590.21 286.7061 591.3135 287.8096 591.3135 289.1719
+			 C 591.3135 290.5332 590.21 291.6367 588.8511 291.6367
+			" />
+
+		      </g>
+		    </g>
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
@@ -470,6 +832,9 @@
   <!-- freedesktop.org logo at upper-right -->
   <use xlink:href="#freedesktop_org_logo" transform="translate(910, 12)" />
 
+  <!-- Red Hat logo at lower-left -->
+  <use xlink:href="#redhat_logo_horizontal" transform="translate(8,768),scale(.5,.5),translate(0, -125)" />
+
   <g font-family="Frutiger">
     <text text-anchor="middle"
 	  fill="black"
@@ -485,7 +850,7 @@
     </g>
     
     <!-- Footer -->
-    <text ss:variable="URL" x="1016" y="760" text-anchor="end" font-size="20">http://cairographics.org</text>
+    <text ss:variable="URL" x="1016" y="753" text-anchor="end" font-size="20">http://cairographics.org</text>
   </g>
 
 </svg>
diff --git a/doc/tutorial/slides/cairo.svg b/doc/tutorial/slides/cairo.svg
index 5a9449b76..133a31f26 100644
--- a/doc/tutorial/slides/cairo.svg
+++ b/doc/tutorial/slides/cairo.svg
@@ -450,6 +450,369 @@
 		    <g id="bullet">
 		      <use x="0" y="0" xlink:href="#cairo_logo" transform="translate(-6,-2) scale(0.1, 0.1)"/>>
 		    </g>
+		    <g id="redhat_logo_horizontal">
+		      <!-- 380x125 Red Hat log (horizontal layout) -->
+                      <g fill="black" stroke="none" 
+                       transform="translate(0,124),scale(1,-1),translate(-214,-258)"
+                       fill-rule="evenodd"
+                      >
+			<!-- r -->
+			<path fill="black" d="
+			 M 367.0625 315.3203
+			 C 367.0625 320.8765 366.9463 324.9644 366.7227 328.6597
+			 L 375.811 328.6597
+			 L 376.2002 320.7764
+			 L 376.4971 320.7764
+			 C 378.5391 326.6221 383.3809 329.5996 387.8594 329.5996
+			 C 388.8843 329.5996 389.4824 329.5601 390.3218 329.373
+			 L 390.3218 319.4863
+			 C 389.3398 319.6763 388.4224 319.7842 387.1592 319.7842
+			 C 382.1597 319.7842 378.688 316.6006 377.751 311.8447
+			 C 377.5732 310.918 377.4805 309.8086 377.4805 308.6777
+			 L 377.4805 287.1504
+			 L 366.9766 287.1504
+			 L 367.0625 315.3203
+			" />
+
+			<!-- e -->
+			<path fill="black" d="
+			 M 402.9927 305.0791
+			 C 403.2715 297.5586 409.0918 294.2695 415.814 294.2695
+			 C 420.6406 294.2695 424.0942 295.0234 427.2681 296.1924
+			 L 428.8232 288.9678
+			 C 425.269 287.4629 420.3413 286.3359 414.3149 286.3359
+			 C 400.8384 286.3359 392.9409 294.6592 392.9409 307.3809
+			 C 392.9409 318.8369 399.8911 329.6772 413.2437 329.6772
+			 C 426.7397 329.6772 431.1338 318.5771 431.1338 309.4893
+			 C 431.1338 307.5381 430.9624 305.9707 430.7593 305.0059
+			 L 402.9927 305.0791
+
+			 M 421.2485 312.3926
+			 C 421.2954 316.2388 419.6206 322.5088 412.5903 322.5088
+			 C 406.1299 322.5088 403.4438 316.645 402.9722 312.3926
+			 L 421.2485 312.3926
+			" />
+
+			<!-- d -->
+			<path fill="black" d="
+			 M 476.355 344.667
+			 L 465.8638 347.5083
+			 L 465.8638 324.1914
+			 L 465.6904 324.1914
+			 C 463.8335 327.2563 459.7407 329.5996 454.0571 329.5996
+			 C 444.0762 329.5996 435.3828 321.3374 435.4478 307.4307
+			 C 435.4478 294.6719 443.2983 286.2168 453.2119 286.2168
+			 C 459.2017 286.2168 464.2114 289.0723 466.6909 293.7217
+			 L 466.8779 293.7217
+			 L 467.3491 287.1504
+			 L 476.6997 287.1504
+			 C 476.5083 289.9717 476.355 294.543 476.355 298.792
+			 L 476.355 344.667
+
+			 M 465.8638 305.1504
+			 C 465.8638 304.0479 465.7856 303.0234 465.5454 302.0869
+			 C 464.4873 297.5439 460.7734 294.6172 456.4819 294.6172
+			 C 449.8721 294.6172 446.0903 300.1885 446.0903 307.8164
+			 C 446.0903 315.5166 449.8384 321.4761 456.6016 321.4761
+			 C 461.3208 321.4761 464.6992 318.1484 465.6274 314.1064
+			 C 465.8071 313.2559 465.8638 312.208 465.8638 311.3711
+			 L 465.8638 305.1504
+			" />
+
+			<!-- h -->
+			<path fill="black" d="
+			 M 503.7964 329.0176
+			 C 500.6836 329.0176 497.8926 328.1187 495.5493 326.6714
+			 C 493.1162 325.2461 491.1353 323.0464 489.959 320.7666
+			 L 489.7915 320.7666
+			 L 489.7915 341.0195
+			 L 485.7427 342.1226
+			 L 485.7427 287.1504
+			 L 489.7915 287.1504
+			 L 489.7915 312.1787
+			 C 489.7915 313.8408 489.9204 314.9946 490.3462 316.2109
+			 C 492.0928 321.3013 496.8896 325.4805 502.689 325.4805
+			 C 511.0664 325.4805 513.9673 318.7603 513.9673 311.3906
+			 L 513.9673 287.1504
+			 L 518.0137 287.1504
+			 L 518.0137 311.8359
+			 C 518.0137 327.0791 507.6753 329.0176 503.7964 329.0176
+			" />
+
+			<!-- a -->
+			<path fill="black" d="
+			 M 554.3413 296.873
+			 C 554.3413 293.6357 554.4692 290.2832 554.9375 287.1504
+			 L 551.2085 287.1504
+			 L 550.6128 293.0156
+			 L 550.4209 293.0156
+			 C 548.438 289.8594 543.8765 286.2168 537.3726 286.2168
+			 C 529.1392 286.2168 525.3057 292.0117 525.3057 297.4688
+			 C 525.3057 306.9121 533.6421 312.6064 550.292 312.4321
+			 L 550.292 313.5234
+			 C 550.292 317.5718 549.5044 325.6475 539.8242 325.5859
+			 C 536.2446 325.5859 532.5132 324.6255 529.5513 322.5366
+			 L 528.2632 325.4805
+			 C 532.0015 328.0137 536.5659 329.0176 540.2705 329.0176
+			 C 552.0801 329.0176 554.3413 320.1509 554.3413 312.8379
+			 L 554.3413 296.873
+
+			 M 550.292 309.0234
+			 C 541.3813 309.2813 529.6128 307.9336 529.6128 298.1055
+			 C 529.6128 292.2246 533.4946 289.5811 537.7578 289.5811
+			 C 544.5796 289.5811 548.4561 293.8018 549.8677 297.7871
+			 C 550.1646 298.6621 550.292 299.5371 550.292 300.2402
+			 L 550.292 309.0234
+			" />
+
+			<!-- t -->
+			<path fill="black" d="
+			 M 570.459 337.0996
+			 L 570.459 328.0801
+			 L 582.1235 328.0801
+			 L 582.1235 324.7959
+			 L 570.459 324.7959
+			 L 570.459 298.1943
+			 C 570.459 292.9912 572.0757 289.7285 576.4692 289.7285
+			 C 578.5815 289.7285 580.0757 290.0078 581.1206 290.3711
+			 L 581.6099 287.2354
+			 C 580.2871 286.6836 578.4302 286.2539 575.9619 286.2539
+			 C 572.9741 286.2539 570.4995 287.1934 568.8994 289.1543
+			 C 567.0469 291.3057 566.4116 294.7412 566.4116 298.916
+			 L 566.4116 324.7959
+			 L 559.5059 324.7959
+			 L 559.5059 328.0801
+			 L 566.4116 328.0801
+			 L 566.4116 335.606
+			 L 570.459 337.0996
+			" />
+
+			<!-- ® for 'redhat' -->
+			<path fill="black" d="
+			 M 335.5 288.9707
+			 L 336.0352 288.9707
+			 L 336.8408 287.6445
+			 L 337.3608 287.6445
+			 L 336.4888 288.9937
+			 C 336.9404 289.0498 337.2832 289.2881 337.2832 289.834
+			 C 337.2832 290.4385 336.9258 290.7051 336.2017 290.7051
+			 L 335.0366 290.7051
+			 L 335.0366 287.6445
+			 L 335.5 287.6445
+			 L 335.5 288.9707
+
+			 M 335.5 289.3643
+			 L 335.5 290.3101
+			 L 336.1318 290.3101
+			 C 336.4531 290.3101 336.7979 290.2402 336.7979 289.8647
+			 C 336.7979 289.3916 336.4492 289.3643 336.0566 289.3643
+			 L 335.5 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 339.0439 289.1719
+			 C 339.0439 287.5176 337.7041 286.1763 336.0493 286.1763
+			 C 334.395 286.1763 333.0527 287.5176 333.0527 289.1719
+			 C 333.0527 290.8271 334.395 292.1675 336.0493 292.1675
+			 C 337.7041 292.1675 339.0439 290.8271 339.0439 289.1719
+
+			 M 336.0493 291.6367
+			 C 334.6865 291.6367 333.5835 290.5332 333.5835 289.1719
+			 C 333.5835 287.8096 334.6865 286.7061 336.0493 286.7061
+			 C 337.4082 286.7061 338.5117 287.8096 338.5117 289.1719
+			 C 338.5117 290.5332 337.4082 291.6367 336.0493 291.6367
+			" />
+
+			<!-- Black background behind The Shadowman -->
+			<path fill="black" d="
+			 M 326.4531 286.208
+			 C 324.1177 286.7451 321.6396 287.0801 319.1338 287.0801
+			 C 314.8496 287.0801 310.9502 286.3389 308.0732 285.1426
+			 C 307.7559 284.9844 307.5303 284.6533 307.5303 284.2764
+			 C 307.5303 284.1406 307.5654 283.999 307.6172 283.8838
+			 C 307.957 282.8975 307.3984 281.8281 304.6157 281.2158
+			 C 300.4883 280.3096 297.8833 276.0527 296.3916 274.6367
+			 C 294.6411 272.9756 289.6973 271.9531 290.4404 272.9434
+			 C 291.0225 273.7188 293.2485 276.1348 294.6016 278.748
+			 C 295.8125 281.083 296.8906 281.7461 298.375 283.9736
+			 C 298.811 284.627 300.4995 286.9219 300.9912 288.7373
+			 C 301.543 290.5107 301.356 292.7344 301.5679 293.6494
+			 C 301.8721 294.9697 303.1182 297.8369 303.2129 299.4531
+			 C 303.2666 300.3691 299.3916 298.1494 297.5532 298.1494
+			 C 295.7144 298.1494 293.9233 299.248 292.2808 299.3281
+			 C 290.248 299.4248 288.9414 297.7607 287.1025 298.0508
+			 C 286.0518 298.2178 285.167 299.1426 283.3311 299.2129
+			 C 280.7178 299.3086 277.5244 297.7607 271.5264 297.9531
+			 C 265.6255 298.1436 260.1753 305.4082 259.4312 306.5635
+			 C 258.5605 307.9199 257.4961 307.9199 256.335 306.8555
+			 C 255.1738 305.792 253.7432 306.627 253.3359 307.3389
+			 C 252.5615 308.6943 250.4927 312.6543 247.2881 313.4824
+			 C 242.8564 314.6309 240.6118 311.0283 240.9033 308.1621
+			 C 241.1987 305.252 243.0801 304.4375 243.9512 302.8906
+			 C 244.8213 301.3428 245.2671 300.3428 246.9053 299.6572
+			 C 248.0674 299.1758 248.5 298.458 248.1533 297.5049
+			 C 247.8506 296.6738 246.6416 296.4834 245.8477 296.4463
+			 C 244.1592 296.3662 242.9756 296.8242 242.1123 297.376
+			 C 241.1084 298.0137 240.292 298.9033 239.416 300.4131
+			 C 238.4023 302.0781 236.8052 302.8037 234.9453 302.8037
+			 C 234.0586 302.8037 233.2295 302.5693 232.4922 302.1895
+			 C 229.5771 300.6748 226.1064 299.7744 222.3706 299.7744
+			 L 218.1572 299.7734
+			 C 216.1064 305.8555 214.9951 312.3682 214.9951 319.1416
+			 C 214.9951 352.6064 242.1226 379.7334 275.5859 379.7334
+			 C 309.0498 379.7334 336.1758 352.6064 336.1758 319.1416
+			 C 336.1758 307 332.6035 295.6895 326.4531 286.208
+			" />
+
+			<!-- The Shadowman's face -->
+			<path fill="white" d="
+			 M 326.4531 286.209
+			 C 324.1177 286.7461 321.6396 287.084 319.1338 287.084
+			 C 314.8496 287.084 310.9502 286.3418 308.0732 285.1436
+			 C 307.7559 284.9873 307.5303 284.6553 307.5303 284.2783
+			 C 307.5303 284.1416 307.5654 284.001 307.6172 283.8838
+			 C 307.957 282.8994 307.3984 281.8311 304.6157 281.2178
+			 C 300.4883 280.3115 297.8833 276.0537 296.3916 274.6416
+			 C 294.6411 272.9766 289.6973 271.9551 290.4404 272.9463
+			 C 291.0225 273.7197 293.2485 276.1367 294.6016 278.749
+			 C 295.8125 281.083 296.8906 281.75 298.375 283.9756
+			 C 298.811 284.627 300.4995 286.9238 300.9912 288.7402
+			 C 301.543 290.5117 301.356 292.7354 301.5679 293.6514
+			 C 301.8721 294.9727 303.1182 297.8379 303.2129 299.457
+			 C 303.2666 300.3721 299.3916 298.1504 297.5532 298.1504
+			 C 295.7144 298.1504 293.9233 299.251 292.2808 299.3301
+			 C 290.248 299.4258 288.9414 297.7627 287.1025 298.0518
+			 C 286.0518 298.2207 285.167 299.1465 283.3311 299.2148
+			 C 280.7178 299.3096 277.5244 297.7627 271.5264 297.9561
+			 C 265.6255 298.1475 260.1753 305.4121 259.4312 306.5674
+			 C 258.5605 307.9219 257.4961 307.9219 256.335 306.8574
+			 C 255.1738 305.7939 253.7432 306.6299 253.3359 307.3438
+			 C 252.5615 308.6963 250.4927 312.6553 247.2881 313.4854
+			 C 242.8564 314.6338 240.6118 311.0313 240.9033 308.1641
+			 C 241.1987 305.2539 243.0801 304.4395 243.9512 302.8926
+			 C 244.8213 301.3438 245.2671 300.3457 246.9053 299.6621
+			 C 248.0674 299.1768 248.5 298.4609 248.1533 297.5068
+			 C 247.8506 296.6768 246.6416 296.4873 245.8477 296.4492
+			 C 244.1592 296.3672 242.9756 296.8262 242.1123 297.376
+			 C 241.1084 298.0176 240.292 298.9043 239.416 300.416
+			 C 238.4023 302.0801 236.8052 302.8086 234.9453 302.8086
+			 C 234.0586 302.8086 233.2295 302.5723 232.4922 302.1934
+			 C 229.5771 300.6748 226.1064 299.7773 222.3706 299.7773
+			 L 218.1572 299.7744
+			 C 226.2363 275.8105 248.8965 258.5527 275.5859 258.5527
+			 C 296.9063 258.5527 315.6538 269.5635 326.4531 286.209
+			" />
+
+			<!-- nose shadow -->
+			<path fill="black" d="
+			 M 288.9307 291.7637
+			 C 289.2422 291.46 289.7793 290.4375 289.1226 289.1396
+			 C 288.7544 288.4521 288.3579 287.9678 287.6489 287.4023
+			 C 286.7969 286.7188 285.1309 285.9307 282.8457 287.3799
+			 C 281.6172 288.1592 281.543 288.4209 279.8467 288.2012
+			 C 278.6348 288.043 278.1533 289.2656 278.5884 290.2832
+			 C 279.0244 291.2969 280.8145 292.1191 283.04 290.8135
+			 C 284.041 290.2256 285.6025 288.9844 286.9688 290.084
+			 C 287.5356 290.5381 287.875 290.8408 288.6611 291.75
+			 C 288.6963 291.7881 288.7461 291.8105 288.8018 291.8105
+			 C 288.8516 291.8105 288.8965 291.793 288.9307 291.7637
+			" />
+
+			<!-- The Shadowman's red hat -->
+			<path fill="#cc0000" d="
+			 M 309.7769 335.2627
+			 C 309.1787 333.251 308.3271 330.6763 304.5391 328.7314
+			 C 303.9878 328.4497 303.7764 328.9126 304.0313 329.3477
+			 C 305.4629 331.7832 305.7168 332.3921 306.1328 333.3525
+			 C 306.7148 334.7568 307.02 336.7549 305.8618 340.9219
+			 C 303.5835 349.1221 298.8296 360.083 295.375 363.6392
+			 C 292.04 367.0698 285.998 368.0361 280.5371 366.6348
+			 C 278.5264 366.1191 274.5918 364.0732 267.2939 365.7168
+			 C 254.665 368.5605 252.7939 362.2368 252.0693 359.4824
+			 C 251.3438 356.7271 249.6045 348.897 249.6045 348.897
+			 C 249.0244 345.7085 248.2646 340.1631 267.874 336.4287
+			 C 277.0088 334.6885 277.4736 332.3276 277.8779 330.6289
+			 C 278.603 327.585 279.7627 325.8438 281.0674 324.9746
+			 C 282.373 324.1035 281.0674 323.3828 279.6187 323.2349
+			 C 275.7285 322.8311 261.3491 326.9541 252.8428 331.7881
+			 C 245.8828 336.0415 245.7656 339.8721 247.3584 343.1211
+			 C 236.8452 344.2573 228.9561 342.1348 227.5254 337.1582
+			 C 225.0693 328.6157 246.3047 314.0264 270.4839 306.7061
+			 C 295.8579 299.0225 321.9556 304.3857 324.8564 320.335
+			 C 326.1738 327.5811 320.0713 332.9419 309.7769 335.2627
+			" />
+
+			<!-- shadow on hat -->
+			<path fill="black" d="
+			 M 270.8711 350.8813
+			 C 263.8721 350.375 263.145 349.6191 261.834 348.2227
+			 C 259.9854 346.2539 257.5508 350.7773 257.5508 350.7773
+			 C 256.0898 351.085 254.3179 353.4404 255.2744 355.6411
+			 C 256.2158 357.8174 257.9551 357.1641 258.5 356.4868
+			 C 259.1626 355.6621 260.5771 354.3125 262.4141 354.3613
+			 C 264.251 354.4097 266.3706 354.7959 269.3262 354.7959
+			 C 272.3213 354.7959 274.335 353.6777 274.4487 352.7168
+			 C 274.5459 351.8965 274.2061 351.1226 270.8711 350.8813
+			" />
+
+			<!-- another shadow on hat -->
+			<path fill="black" d="
+			 M 278.2236 362.4463
+			 C 278.2129 362.4453 278.2021 362.4438 278.1919 362.4438
+			 C 278.084 362.4438 277.9961 362.5273 277.9961 362.6274
+			 C 277.9961 362.7007 278.041 362.7646 278.106 362.7939
+			 C 279.4629 363.5107 281.4873 364.0811 283.8042 364.3169
+			 C 284.499 364.3887 285.1787 364.4248 285.832 364.4307
+			 C 285.9478 364.4307 286.0615 364.4297 286.1787 364.4277
+			 C 290.062 364.3398 293.1719 362.7974 293.1255 360.9814
+			 C 293.0791 359.165 289.8955 357.7637 286.0112 357.8506
+			 C 284.7529 357.8794 283.5732 358.0615 282.5576 358.3545
+			 C 282.4385 358.3857 282.3506 358.4883 282.3506 358.6094
+			 C 282.3506 358.731 282.4385 358.834 282.5605 358.8638
+			 C 284.9839 359.4248 286.6191 360.3408 286.5039 361.207
+			 C 286.3511 362.3545 283.1816 362.979 279.4248 362.6011
+			 C 279.0137 362.5596 278.6118 362.5068 278.2236 362.4463
+			" />
+
+			<!-- ® for The Shadowman -->
+			<path fill="black" d="
+			 M 588.3018 288.9707
+			 L 588.8369 288.9707
+			 L 589.6426 287.6445
+			 L 590.1626 287.6445
+			 L 589.2905 288.9937
+			 C 589.7422 289.0498 590.085 289.2881 590.085 289.834
+			 C 590.085 290.4385 589.7275 290.7051 589.0034 290.7051
+			 L 587.8384 290.7051
+			 L 587.8384 287.6445
+			 L 588.3018 287.6445
+			 L 588.3018 288.9707
+
+			 M 588.3018 289.3643
+			 L 588.3018 290.3101
+			 L 588.9336 290.3101
+			 C 589.2549 290.3101 589.5996 290.2402 589.5996 289.8647
+			 C 589.5996 289.3916 589.251 289.3643 588.8584 289.3643
+			 L 588.3018 289.3643
+			" />
+
+			<path fill="black" d="
+			 M 591.8457 289.1719
+			 C 591.8457 287.5176 590.5059 286.1763 588.8511 286.1763
+			 C 587.1968 286.1763 585.8545 287.5176 585.8545 289.1719
+			 C 585.8545 290.8271 587.1968 292.1675 588.8511 292.1675
+			 C 590.5059 292.1675 591.8457 290.8271 591.8457 289.1719
+
+			 M 588.8511 291.6367
+			 C 587.4883 291.6367 586.3853 290.5332 586.3853 289.1719
+			 C 586.3853 287.8096 587.4883 286.7061 588.8511 286.7061
+			 C 590.21 286.7061 591.3135 287.8096 591.3135 289.1719
+			 C 591.3135 290.5332 590.21 291.6367 588.8511 291.6367
+			" />
+
+		      </g>
+		    </g>
+
 	</defs>
 
   <g id="watermark" transform="translate(200, 185), rotate(-50), scale(2.5)">
@@ -470,6 +833,9 @@
   <!-- freedesktop.org logo at upper-right -->
   <use xlink:href="#freedesktop_org_logo" transform="translate(910, 12)" />
 
+  <!-- Red Hat logo at lower-left -->
+  <use xlink:href="#redhat_logo_horizontal" transform="translate(8,768),scale(.5,.5),translate(0, -125)" />
+
   <g font-family="Frutiger">
     <!-- Slide title -->
     <g id="slide_title" transform="translate(512, 153)">
@@ -502,7 +868,7 @@
     </g>
     
     <!-- Footer -->
-    <text ss:variable="URL" x="1016" y="760" text-anchor="end" font-size="20">http://cairographics.org</text>
+    <text ss:variable="URL" x="1016" y="753" text-anchor="end" font-size="20">http://cairographics.org</text>
   </g>
 
 </svg>
diff --git a/doc/tutorial/slides/rendering-model.png b/doc/tutorial/slides/rendering-model.png
new file mode 100644
index 000000000..900898417
--- /dev/null
+++ b/doc/tutorial/slides/rendering-model.png
diff --git a/doc/tutorial/slides/tutorial.xml b/doc/tutorial/slides/tutorial.xml
index 6ccbbfb84..2f8a87598 100644
--- a/doc/tutorial/slides/tutorial.xml
+++ b/doc/tutorial/slides/tutorial.xml
@@ -15,19 +15,20 @@
       <lc></lc>
       <lc align="center">http://cairographics.org/tutorial</lc>
       <lc></lc>
+      <li>wget http://cairographics.org/tutorial.tar.gz</li>
       <li>tar xzf tutorial.tar.gz</li>
       <li>cd tutorial</li>
       <li>make</li>
       <lc></lc>
-      <lc align="center">IRC help: freenode.net #cairo</lc>
+      <lc align="center">IRC: irc.freenode.net #cairo</lc>
     </slide>
 
     <slide variant="title">
       <lc>Carl Worth</lc>
       <lc>Red Hat, Inc.</lc>
       <lc></lc>
-      <lc>Ottawa Linux Symposium</lc>
-      <lc>2005-07-22</lc>
+      <lc>linux.conf.au</lc>
+      <lc>2006-01-26</lc>
       <lc>http://cairographics.org</lc>
     </slide>
 
@@ -48,8 +49,14 @@
     <slide title="Fireworks">
     </slide>
 
+    <slide title="What you can do about it">
+      <li>Let application authors know there are options</li>
+      <li>Learn to use cairo—patch the applications</li>
+      <li>Write your own cairo-using applications</li>
+    </slide>
+
     <slide title="Getting Started" variant="separator">
-      <lc align="center">Various shell cairo program</lc>
+      <lc align="center">Various shell cairo programs</lc>
     </slide>
 
     <slide title="Minimal cairo-xlib program" variant="code">
@@ -92,8 +99,7 @@
       <lc>    gtk_container_add (GTK_CONTAINER (window), drawing_area);</lc>
       <lc>    g_signal_connect (drawing_area, "expose-event",</lc>
       <lc>                      G_CALLBACK (handle_expose), NULL);</lc>
-      <lc>    gtk_widget_show_all (window);</lc>
-      <lc>    gtk_main ();</lc>
+      <lc>    gtk_widget_show_all (window); gtk_main ();</lc>
       <lc>}</lc>
     </slide>
 
@@ -107,7 +113,6 @@
       <lc></lc>
       <lc>    surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,</lc>
       <lc>                                          WIDTH, HEIGHT);</lc>
-      <lc>    </lc>
       <lc>    cr = cairo_create (surface);</lc>
       <lc>    draw (cr);</lc>
       <lc>    cairo_surface_write_to_png (surface, "foo.png");</lc>
@@ -122,13 +127,12 @@
     <slide title="Minimal cairo-pdf program" variant="code">
       <lc>#include &lt;cairo.h&gt;</lc>
       <lc>#include &lt;cairo-pdf.h&gt;</lc>
-      <lc></lc>
       <lc>int main (void)</lc>
       <lc>{</lc>
       <lc>    cairo_surface_t *surface;</lc>
       <lc>    cairo_t *cr;</lc>
       <lc></lc>
-      <lc>    surface = cairo_pdf_surface_create (foo.pdf, WIDTH, HEIGHT);</lc>
+      <lc>    surface = cairo_pdf_surface_create ("foo.pdf", WIDTH, HEIGHT);</lc>
       <lc>    </lc>
       <lc>    cr = cairo_create (surface);</lc>
       <lc>    draw (cr);</lc>
@@ -142,26 +146,26 @@
     </slide>
 
     <slide title="Minimal pycairo-gtk shell" variant="code">
+      <lc>#!/usr/bin/env python</lc>
       <lc>import gtk</lc>
       <lc>import cairo</lc>
-      <lc>import cairo.gtk</lc>
-      <lc></lc>
-      <lc>def handle_expose (widget, event):</lc>
-      <lc>    cr = cairo.gtk.gdk_cairo_create (widget.window)</lc>
-      <lc>    draw (c)</lc>
       <lc></lc>
+      <lc>def expose (widget, event):</lc>
+      <lc>    cr = widget.window.cairo_create ()</lc>
+      <lc>    draw (cr)</lc>
+      <lc>      </lc>
       <lc>win = gtk.Window ()</lc>
-      <lc>win.connect ('destroy', lambda x: gtk.main_quit ())</lc>
+      <lc>win.connect ('destroy', gtk.main_quit)</lc>
+      <lc>win.set_default_size(WIDTH, HEIGHT)</lc>
       <lc>drawingarea = gtk.DrawingArea ()</lc>
       <lc>win.add (drawingarea)</lc>
-      <lc>drawingarea.connect ('expose_event', handle_expose)</lc>
-      <lc>drawingarea.set_size_request (WIDTH, HEIGHT)</lc>
-      <lc>drawingarea.set_double_buffered (False)</lc>
+      <lc>drawingarea.connect ('expose_event', expose)</lc>
       <lc>win.show_all ()</lc>
       <lc>gtk.main ()</lc>
     </slide>
 
     <slide title="Minimal pycairo-png shell" variant="code">
+      <lc>#!/usr/bin/env python</lc>
       <lc>import cairo</lc>
       <lc></lc>
       <lc>surface = cairo.ImageSurface (cairo.FORMAT_ARGB32, WIDTH, HEIGHT)</lc>
@@ -179,11 +183,42 @@
       <lc>draw (cr);</lc>
     </slide>
 
-    <slide title="Drawing" variant="separator">
+    <slide title="Available bindings:" variant="large-content">
+      <li>C++ (cairomm)</li>
+      <li>Haskell (hscairo)</li>
+      <li>Java (CairoJava, cairo-java)</li>
+      <li>Common Lisp (cl-cairo)</li>
+      <li>Nickle (cairo-5c)</li>
+      <li>Objective Caml (cairo-ocaml)</li>
+      <li>perl (cairo-perl)</li>
+      <li>python (pycairo)</li>
+      <li>ruby (rcairo)</li>
+      <li>squeak (cairo-squeak)</li>
+    </slide>
+
+    <slide title="Following along" >
+      <lc></lc>
+      <lc align="center">http://cairographics.org/tutorial</lc>
+      <lc></lc>
+      <li>wget http://cairographics.org/tutorial.tar.gz</li>
+      <li>tar xzf tutorial.tar.gz</li>
+      <li>cd tutorial</li>
+      <li>make</li>
+      <lc></lc>
+      <lc align="center">IRC: irc.freenode.net #cairo</lc>
+    </slide>
+
+    <slide title="cairo's rendering model">
+      <g>
+	<image x="0" y="0" xlink:href="rendering-model.png" width="800" height="500" />
+      </g>
+    </slide>
+
+    <slide title="Let's start drawing" variant="separator">
       <lc align="center">Here comes the fun part</lc>
     </slide>
 
-    <slide title="Cairo API">
+    <slide title="API Overview" variant="large-content">
       <ul>
 	<li>Paths</li>
 	<ul>
@@ -193,15 +228,37 @@
 	<li>Images</li>
 	<ul>
 	  <li>loading from disk</li>
-	  <li>transforming</li>
-	  <li>using as pattern</li>
+	  <li>using as source</li>
+	  <li>transforming/filtering</li>
 	</ul>
 	<li>Text</li>
 	<ul>
-	  <li>Simple API example</li>
+	  <li>“Toy” API</li>
+	  <li>“Real” API</li>
 	</ul>
       </ul>
-      </slide>
+    </slide>
+
+    <slide title="Drawing functions" variant="large-content">
+      <ul>
+	<li>Paths</li>
+	<ul>
+	  <li>cairo_stroke</li>
+	  <li>cairo_fill</li>
+	</ul>
+	<li>Images</li>
+	<ul>
+	  <li>cairo_paint</li>
+	  <li>cairo_mask</li>
+	  <li>cairo_paint_with_alpha</li>
+	</ul>
+	<li>Text</li>
+	<ul>
+	  <li>cairo_show_text (“toy”)</li>
+	  <li>cairo_show_glyphs (“real”)</li>
+	</ul>
+      </ul>
+    </slide>
 
       <slide title="Paths">
 	<ul>
diff --git a/doc/tutorial/src/Makefile b/doc/tutorial/src/Makefile
index 1ae54dfcc..2aeef4f02 100644
--- a/doc/tutorial/src/Makefile
+++ b/doc/tutorial/src/Makefile
@@ -3,7 +3,7 @@ MYCFLAGS=$(shell pkg-config --cflags --libs cairo gtk+-2.0) -Wall -g -Wpointer-a
 # If you don't want to/can't compile all of these targets, then trim
 # this list.
 # all: gtk xlib pdf png
-all: gtk xlib pdf png
+all: gtk xlib png
 
 GTK_EXAMPLES=$(patsubst %.c,%-gtk,$(wildcard *.c))
 gtk: $(GTK_EXAMPLES)