# HG changeset patch
# User paulson
# Date 1265104147 0
# Node ID ab5456cdd28f848634d8381f8e95db6b44eda409
# Parent  475aef44d5fb4814dff7fd2f606a0279d7d86f87# Parent  7bba12c3b7b6b2586b2c2af2a7f494679e841981
merged

diff -r 475aef44d5fb -r ab5456cdd28f doc-src/TutorialI/Protocol/NS_Public.thy
--- a/doc-src/TutorialI/Protocol/NS_Public.thy	Mon Feb 01 14:12:12 2010 +0100
+++ b/doc-src/TutorialI/Protocol/NS_Public.thy	Tue Feb 02 09:49:07 2010 +0000
@@ -76,7 +76,7 @@
 @{term [display,indent=5] "Says A' B (Crypt (pubK B) \<lbrace>Nonce NA, Agent A\<rbrace>)"}
 may be extended by an event of the form
 @{term [display,indent=5] "Says B A (Crypt (pubK A) \<lbrace>Nonce NA, Nonce NB, Agent B\<rbrace>)"}
-where @{text NB} is a fresh nonce: @{term "Nonce NB \<in> used evs2"}.
+where @{text NB} is a fresh nonce: @{term "Nonce NB \<notin> used evs2"}.
 Writing the sender as @{text A'} indicates that @{text B} does not 
 know who sent the message.  Calling the trace variable @{text evs2} rather
 than simply @{text evs} helps us know where we are in a proof after many
diff -r 475aef44d5fb -r ab5456cdd28f doc-src/TutorialI/Protocol/document/NS_Public.tex
--- a/doc-src/TutorialI/Protocol/document/NS_Public.tex	Mon Feb 01 14:12:12 2010 +0100
+++ b/doc-src/TutorialI/Protocol/document/NS_Public.tex	Tue Feb 02 09:49:07 2010 +0000
@@ -84,7 +84,7 @@
 \begin{isabelle}%
 \ \ \ \ \ Says\ B\ A\ {\isacharparenleft}Crypt\ {\isacharparenleft}pubK\ A{\isacharparenright}\ {\isasymlbrace}Nonce\ NA{\isacharcomma}\ Nonce\ NB{\isacharcomma}\ Agent\ B{\isasymrbrace}{\isacharparenright}%
 \end{isabelle}
-where \isa{NB} is a fresh nonce: \isa{Nonce\ NB\ {\isasymin}\ used\ evs{\isadigit{2}}}.
+where \isa{NB} is a fresh nonce: \isa{Nonce\ NB\ {\isasymnotin}\ used\ evs{\isadigit{2}}}.
 Writing the sender as \isa{A{\isacharprime}} indicates that \isa{B} does not 
 know who sent the message.  Calling the trace variable \isa{evs{\isadigit{2}}} rather
 than simply \isa{evs} helps us know where we are in a proof after many