Browse files

Several mostly technical tweaks, image sizes etc

- Attempt to set some sensible sizes for all images, greatly reducing the
  number of warnings on build.
- Modify pickchapter.sh so it now also accepts '*' as a chapter, adjust
  Makefile so it uses '*' as the chapter for the tutorial.
- Update TODO
  • Loading branch information...
1 parent cd572d4 commit 4e806ca1ec53d2fdd5a2fb81fc36d76dceb65471 @KristianLyng KristianLyng committed Mar 12, 2012
Showing with 28 additions and 40 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 Makefile
  3. +3 −8 TODO
  4. +1 −1 util/pickchapter.sh
  5. +22 −29 varnish_tutorial.rst
View
2 .gitignore
@@ -10,7 +10,7 @@ src/AJAX.rst
src/Appendix_A__Extra_Material.rst
src/Cache_invalidation.rst
src/Cookies.rst
-src/ESI.rst
+src/Content_Composition.rst
src/Finishing_words.rst
src/Getting_started.rst
src/HTTP.rst
View
2 Makefile
@@ -10,7 +10,7 @@ PICK = "./util/pickchapter.sh"
# If you want a new set, just make a new variable and that's the name of
# the pdfs you can now build.
-tutorial = "Introduction,Getting started,Tuning,HTTP,VCL Basics,VCL functions,Cache invalidation,Saving a request,Content Composition,Varnish Programs,Finishing words"
+tutorial = "*"
sysadmin = "Introduction,Getting started,Tuning,VCL Basics,VCL functions,Cache invalidation,Saving a request,Varnish Programs,Finishing words"
webdev = "Introduction,Getting started,HTTP,VCL Basics,VCL functions,Cache invalidation,Content Composition,Finishing words"
View
11 TODO
@@ -6,23 +6,17 @@ Going-public
- Better build instructions
- License and copyright
- Formalize style practices
-- Introduction to the test environment
Merging
=======
- Fix the titles for the individual builds
-- The exercise-code for the web-dev material should be more accessible.
- It's currently included in an appendix that's never included anywhere.
-- Verify that all chapters are sensible as slides too.
-- The flow needs to be re-evaluated, particularly towards the last few
- chapters, after VCL.
- Unify the style of the new and old chapters
-- Describe the new chapters a bit in NEWS
Content
=======
+- Introduction to the test environment
- In getting started: Start out early by describing:
- Brief discussion on the test setup.
- Intro chapter for web?
@@ -54,6 +48,8 @@ Webdev-related content
- Fix date-references in php-code
- Need to verify internal linking.
+- The exercise-code for the web-dev material should be more accessible.
+ It's currently included in an appendix that's never included anywhere.
- Distribute it in a tar-ball?
Technical
@@ -68,7 +64,6 @@ Technical
- Make distdist == scp and formulate Announce-mail.
- Automate fetch default VCL from Varnish
- Verify fonts
-- Fix image-sizes
- Reduce number of blank pages
- slide-only class, to allow content to go over multiple slides without
resulting in multiple empty pages in the printed version
View
2 util/pickchapter.sh
@@ -12,7 +12,7 @@ BEGIN {
}
{
for (a in includea) {
- if (includea[a] == chapter) {
+ if (includea[a] == chapter || (chapter != "" && includea[a] == "*")) {
print last
break
}
View
51 varnish_tutorial.rst
@@ -538,12 +538,7 @@ varnishlog
97 RxRequest c GET
97 RxURL c /style.css
97 RxProtocol c HTTP/1.1
- 97 RxHeader c User-Agent: Mozilla/5.0 (Windows; U; Windows NT \
- 6.0; nb-NO; rv:1.9.1b1) Gecko/20081007 Firefox/3.1b1
- 97 RxHeader c Accept: text/css,*/*;q=0.1
- 97 RxHeader c Accept-Encoding: gzip,deflate,bzip2
97 RxHeader c Host: www.example.com
- 97 RxHeader c Connection: Keep-Alive
97 VCL_call c recv lookup
97 VCL_call c hash hash
97 Hit c 117505004
@@ -553,16 +548,11 @@ varnishlog
97 TxProtocol c HTTP/1.1
97 TxStatus c 200
97 TxResponse c OK
- 97 TxHeader c Server: Apache/2.2.8 (Ubuntu)
- 97 TxHeader c Last-Modified: Fri, 21 Nov 2008 13:49:20 GMT
- 97 TxHeader c ETag: "210215-c32-45ca34fd121800"
- 97 TxHeader c Content-Type: text/css
97 TxHeader c Content-Length: 3218
97 TxHeader c Date: Sat, 22 Aug 2008 01:10:10 GMT
97 TxHeader c X-Varnish: 117511501 117505004
97 TxHeader c Age: 2
97 TxHeader c Via: 1.1 varnish
- 97 TxHeader c Connection: keep-alive
97 ReqEnd c 117511501 1227316210.534358978 \
1227316210.535176039 0.035283089 0.000793934 0.000023127
@@ -643,13 +633,6 @@ varnishstat
53570 . . N struct object
50070 . . N struct objecthead
20 . . N struct vbe_conn
- 186 . . N struct bereq
- 1200 . . N worker threads
- 1200 0.00 0.45 N worker threads created
- 2526 0.00 0.94 N overflowed work requests
- 8 . . N backends
- 84929 . . N expired objects
- 1002104 . . N LRU moved objects
.. container:: handout
@@ -1523,7 +1506,8 @@ HTTP request/response control flow
----------------------------------
.. image:: ui/img/httprequestflow.png
- :scale: 70%
+ :align: center
+ :width: 80%
The client sends an HTTP request to the server which returns an HTTP response
with the message body.
@@ -1703,7 +1687,8 @@ Example of an `If-Modified-Since` header: ::
If-Modified-Since: Wed, 01 Sep 2004 13:24:52 GMT
.. image:: ui/img/httpifmodifiedsince.png
- :scale: 70%
+ :align: center
+ :height: 1235px
If-None-Match
-------------
@@ -1724,7 +1709,9 @@ Example of an `If-None-Match` header : ::
If-None-Match: "1edec-3e3073913b100"
.. image:: ui/img/httpifnonematch.png
- :scale: 70%
+ :align: center
+ :width: 80%
+
Etag
----
@@ -1792,15 +1779,17 @@ There is a cache-hit when Varnish returns a page from its cache instead of
forwarding the request to the origin server.
.. image:: ui/img/httpcachehit.png
- :scale: 70%
+ :align: center
+ :width: 60%
**cache-miss**
There is a cache-miss when Varnish has to forward the request to the origin
server so the page can be serviced.
.. image:: ui/img/httpcachemiss.png
- :scale: 70%
+ :align: center
+ :width: 60%
VCL Basics
@@ -3650,7 +3639,8 @@ Edge Side Includes
- Testing ESI without Varnish
.. image:: ui/img/esi.png
- :scale: 60%
+ :align: center
+ :width: 60%
.. container:: handout
@@ -3757,15 +3747,17 @@ Testing ESI without Varnish
Masquerading AJAX requests
--------------------------
-What works:
++------------------------------+-------------------------------+
+| .. image:: ui/img/ajaxok.png | .. image:: ui/img/ajaxko.png |
+| :align: center | :align: center |
+| :width: 900px | :width: 900px |
++------------------------------+-------------------------------+
+| What works | What does not work |
++------------------------------+-------------------------------+
+
-.. image:: ui/img/ajaxok.png
- :scale: 75%
-What does not work:
-.. image:: ui/img/ajaxko.png
- :scale: 75%
.. container:: handout
@@ -4059,3 +4051,4 @@ purgearticle.php
.. include:: material/webdev/purgearticle.php
:literal:
+

0 comments on commit 4e806ca

Please sign in to comment.