From 7cb0818b99d47fbc41835d760f0d3cc2f4b156d5 Mon Sep 17 00:00:00 2001
From: rkaldung <roy@kaldung.com>
Date: Sun, 15 Feb 2015 11:00:40 +0100
Subject: [PATCH] added todos, replaced literals

---
 CREDITS            |  2 +-
 doc/GLOSSARY.md    |  4 ++--
 doc/PERMISSIONS.md | 20 ++++++++++++++++++++
 lib/user_agent.rb  |  3 ++-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 doc/PERMISSIONS.md

diff --git a/CREDITS b/CREDITS
index 866ecc01a..c2f28327a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -36,7 +36,7 @@ D: Development
 W: https://github.com/martini
 --
 N: Roy Kaldung
-D: Operations & QA Hero
+D: DevOps & QA Hero
 W: https://github.com/rkaldung
 --
 N: Felix Niklas
diff --git a/doc/GLOSSARY.md b/doc/GLOSSARY.md
index 5bdeb7e7c..0fa408fd3 100644
--- a/doc/GLOSSARY.md
+++ b/doc/GLOSSARY.md
@@ -4,10 +4,10 @@
 
 * case
 
-   All request are named case. In other systems this is also called issues, ticket, etc.
+   All request are named case. In other systems this is also called issue, ticket, etc.
 
 * channel
-   Channels are the incoming and outgoing ways where articles flow. There are assigned to groups. Channels can be e-mail, chat, twitter, etc. New channels can be added via the plugin mechanism.
+   Channels are the incoming and outgoing ways where articles flow. They are assigned to groups. Channels can be e-mail, chat, twitter, etc. New channels can be added via the plugin mechanism.
 
 * group
 
diff --git a/doc/PERMISSIONS.md b/doc/PERMISSIONS.md
new file mode 100644
index 000000000..a316054f9
--- /dev/null
+++ b/doc/PERMISSIONS.md
@@ -0,0 +1,20 @@
+##List of available permissions in Zammad
+
+###Channel administrator
+Add, modify and delete channels.
+###Channel manager
+Modify channels.
+###Group administrator
+Add, modify and delete groups.
+###Group manager
+Modify groups.
+###System administrator
+Overall permission.
+###User administrator
+Manage users w/ type agent and user.
+###Customer administrator
+Is allowed to add, modify and delete customer.
+###Customer manager
+Has the permission to add and modify.
+###Organization administrator
+###Organization manager
\ No newline at end of file
diff --git a/lib/user_agent.rb b/lib/user_agent.rb
index c67f8b339..8b71c0a25 100644
--- a/lib/user_agent.rb
+++ b/lib/user_agent.rb
@@ -45,6 +45,7 @@ returns
 
       if uri.scheme =~ /https/i
         http.use_ssl = true
+        # @TODO verify_mode should be configurable
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
@@ -130,7 +131,7 @@ returns
         )
       end
 
-      raise "Unable to proccess http call '#{response.inspect}'"
+      raise "Unable to process http call '#{response.inspect}'"
     end
 
     def self.ftp(uri,options)