Updates to the manual

- new export features

- contact user features

app/View/Pages/administration.ctp

@@ -84,6 +84,17 @@ To add a new user, click on the New User button in the administration menu to th
 	<li><em>Change Password:</em> Setting this flag will require the user to change password after the next login.<br /><br /></li>
 	<li><em>Gpgkey:</em> The key used for encrypting e-mails sent through the system. <br /><br /></li>
 </ul>
+<h3>Contacting a user:</h3>
+Site admins can use the "Contact users" feature to send all or an individual user an e-mail. Users that have a PGP key set will receive their e-mails encrypted. When clicking this button on the left, you'll be presented with a form that allows you to specify the type of the e-mail, who it should reach and what the content is using the following options:<br /><br />
+<img src="/img/doc/contact.png" alt = "Contact" title = "Contact your users here."/><br /><br />
+<ul>
+	<li><em>Action:</em> This defines the type of the e-mail, which can be a custom message or a password reset. Password resets automatically include a new temporary password at the bottom of the message and will automatically change the user's password accordingly.<br /><br /></li>
+	<li><em>Recipient:</em> The recipient toggle lets you contact all your users, a single user (which creates a second drop-down list with all the e-mail addresses of the users) and potential future users (which opens up a text field for the e-mail address and a text area field for a PGP public key).<br /><br /></li>
+	<li><em>Subject:</em> In the case of a custom e-mail, you can enter a subject line here.<br /><br /></li>
+	<li><em>Subject:</em> In the case of a custom e-mail, you can enter a subject line here.<br /><br /></li>
+	<li><em>Custom message checkbox:</em> This is available for password resets, you can either write your own message (which will be appended with a temporary key and the signature), or let the system generate one automatically.<br /><br /></li>
+</ul>
+Keep in mind that all e-mails sent through this system will, in addition to your own message, will be signed in the name of the instance's host organisation's support team, will include the e-mail address of the instance's support (if the contact field is set in the bootstrap file), and will include the instance's PGP signature for users that have a PGP key set (and thus are eligible for an encrypted e-mail).
 <br /><hr /><br />
 <h2><a name ="roles"></a>Managing the roles</h2>
 Privileges are assigned to users by assigning them to rule groups, which use one of four options determining what they can do with events and four additional privilege elevating settings. The four options for event manipulation are: Read Only, Manage My Own Events, Manage Organisation Events, Manage &amp; Publish Organisation Events. The extra privileges are admin, sync, authentication key usage and audit permission<br /><br />

app/View/Pages/using_the_system.ctp

@@ -8,9 +8,10 @@
 	<li>b. <a href="#browsing_events">Browsing past events</a></li>
 	<li>c. <a href="#update_events">Updating and modifying events</a></li>
 	<li>d. <a href="#contact">Contacting the publisher</a></li>
-	<li>e. <a href="#export">Exporting data</a></li>
-	<li>f. <a href="#connect">Connecting to other servers</a></li>
-	<li>g. <a href="#rest">Rest API</a></li>
+	<li>e. <a href="#automation">Automation</a></li>
+	<li>f. <a href="#export">Exporting data</a></li>
+	<li>g. <a href="#connect">Connecting to other servers</a></li>
+	<li>h. <a href="#rest">Rest API</a></li>
 </ul>
 4. <?php echo $this->Html->link(__('Administration', true), array('controller' => 'pages', 'action' => 'display', 'administration')); ?><br />
 5. <?php echo $this->Html->link(__('Categories and Types', true), array('controller' => 'pages', 'action' => 'display', 'categories_and_types')); ?><br />
@@ -160,8 +161,8 @@ Once the event is found and the event view opened, click the button titled "Cont
 <br /><img src="/img/doc/contact_reporter.png" alt = "" title = "Enter your message to the reporter and choose whether his/her entire organisation should get the message or not by ticking the check-box."/><br /><br />
 By default, the message will be sent to every member of the organisation that posted the event in the first place, but if you tick the check-box below the message field before sending the mail, only the person that reported the event will get e-mailed. <br />
 <br /><hr /><br />
-<a name ="export"></a><h2>Exporting data:</h2>
-It is possible to quickly and conveniently export the data contained within the system using the export features located in the main menu on the left. There are various sets of data that can be exported, by using the authentication key provided by the system (also shown on the export page). If for whatever reason you would need to invalidate your current key and get a new one instead (for example due to the old one becoming compromise) just hit the reset link next to the authentication key in the export view or in your "my profile" view.<br /><br />
+<a name ="automation"></a><h2>Automation:</h2>
+It is possible to quickly and conveniently export the data contained within the system using the automation features located in the main menu on the left (available to users with authentication key access only). There are various sets of data that can be exported, by using the authentication key provided by the system (also shown on the export page). If for whatever reason you would need to invalidate your current key and get a new one instead (for example due to the old one becoming compromised) just hit the reset link next to the authentication key in the export view or in your "my profile" view.<br /><br />
 The following types of export are possible:<br /><br />
 	<h3>XML export:</h3>
 		Exports all attributes and the event data of every single event in the database (that you are eligible to see) in the XML format. The usage is:<br /><br /><i>&lt;server&gt;/events/xml/&lt;authentication_key&gt;</i><br /><br />
@@ -178,6 +179,14 @@ The following types of export are possible:<br /><br />
 		<i>&lt;server&gt;/events/text/&lt;authentication_key&gt;/&lt;type&gt;</i><br /><br />
 		Type could be any valid type (as according to the list of <?php echo $this->Html->link(__('categories and types', true), array('controller' => 'pages', 'action' => 'display', 'categories_and_types')); ?>), for example md5, ip-src or comment.<br />
 <br /><hr /><br />
+<a name ="export"></a><h2>Exporting data:</h2>
+For users that do not have authentication key access, an alternate export feature is available that relies on your interactive login to the site. To access these, just use the automation menu button to the left and you'll be presented with a list of export options. The results of the export will automatically be offered as a file download.<br /><br/>
+<br /><img src="/img/doc/export.png" alt = "" title = "Use the export features here to quickly download data in various formats"/><br /><br />
+Apart from that, it's also possible to export all events involved in a search attribute result table, by using the "Download results as XML" button on the left menu bar. <br /><br />
+<br /><img src="/img/doc/export_search.png" alt = "" title = "Download a .xml from all the events that are shown through an attribute in the search results."/><br /><br />
+Each event's view has its own export feature, both as an XML export and as a .ioc file. To reach these features, just navigate to an event and use the appropriate buttons on the right side.<br /><br />
+<br /><img src="/img/doc/export_event.png" alt = "" title = "Download a .xml or a .ioc of the event."/><br /><br />
+<br /><hr /><br />
 <h2><a name ="connect"></a>Connecting to other instances:</h2>
 Apart from being a self contained repository of attacks/malware, one of the main features of MISP is its ability to connect to other instances and share (parts of) its information. The following options allow you to set up and maintain such connections.<br /><br />
 <h3><a name ="new_server"></a>Setting up a connection to another server:</h3>