Merge branch 'master' of github.com:prawnpdf/prawn

zolzaya13 · Oct 17, 2014 · 75abbcf · 75abbcf
2 parents 0249316 + eeedf36
commit 75abbcf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1 @@
+Jeremy Friesen <[email protected]> Jeremy Friesen <[email protected]>
diff --git a/manual/security/security.rb b/manual/security/security.rb
@@ -18,7 +18,7 @@
       The examples include:")
 
       list( "How to encrypt the document without the need for a password",
-            "How to configure the regular user permitions",
+            "How to configure the regular user permissions",
             "How to require a password for the regular user",
             "How to set a owner password that bypass the document permissions"
           )
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Jeremy Friesen <[email protected]> Jeremy Friesen <[email protected]>