Browse files

Merge pull request #21 from pettter/master

Fixes for #15 and stopgap measure for #18
  • Loading branch information...
2 parents c2634a6 + 377af5c commit ecf532e10a9ba5910ef9c6f653679063d71d6877 @pettter pettter committed Oct 17, 2012
Showing with 12 additions and 4 deletions.
  1. +6 −0 src/Makefile
  2. +2 −2 src/chapter_10_disk_encryption/
  3. +3 −1 src/
  4. +1 −1 src/main.tex
@@ -1,4 +1,10 @@
+all: tex combined
pdflatex main.tex
pdflatex main.tex
+ cat */*.md >
@@ -17,7 +17,7 @@ Press 'Next >' and continue to the next screen.
In the above screen you want to be sure that you choose the second option 'Hidden TrueCrypt Volume'. Select this and click on 'Next >' you will then be asked to choose the location and name of the TrueCrypt *outer* volume.
-![Hidden volumes](hidden_vol_003.png)
+<!--![Hidden volumes](hidden_vol_003.png)-->
Click 'Select File...' and browse to a location for a new TrueCrypt volume. We will use the name 'myencryptedfile' in this example. Its the same name as we used in the last example so be aware that if you have just followed those instructions you must now create a new volume with a new name.
@@ -59,4 +59,4 @@ The TrueCrypt manual it is referring to is not this manual. They mean this manua
Click 'OK' and keep and exit TrueCrypt. You can now mount the volume as noted in the previous chapter.
@@ -1 +1,3 @@
-for f in */*.md;do pandoc -f markdown -t latex $f -o $f.tex; done
+for f in */*.md; do
+ pandoc -f markdown -t latex $f -o $f.tex
@@ -7,6 +7,7 @@
@@ -16,7 +17,6 @@
\author{Various authors}

0 comments on commit ecf532e

Please sign in to comment.