Merge branch 'master' of github.com:MISP/PyMISP

MISP · Jan 20, 2017 · 9cc3c6e · 9cc3c6e
2 parents b26c021 + 10b95c7
commit 9cc3c6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ python last.py -l 10
 
 ## Documentation
 
-[PyMISP API documentation is available](http://www.circl.lu/assets/files/PyMISP.pdf).
+[PyMISP API documentation is available](https://media.readthedocs.org/pdf/pymisp/master/pymisp.pdf).
 
 Documentation can be generated with epydoc:
 

diff --git a/pymisp/api.py b/pymisp/api.py
@@ -1012,7 +1012,7 @@ def get_version_master(self):
     # ############## Export Attributes in text ####################################
 
     def get_all_attributes_txt(self, type_attr):
-
+        """Get all attributes from a specific type as plain text. Only published and IDS flagged attributes are exported."""
         session = self.__prepare_session('txt')
         url = urljoin(self.root_url, 'attributes/text/download/%s' % type_attr)
         response = session.get(url)