Skip to content

Commit

Permalink
Merge pull request #114 from rigdenlab/fix_docs
Browse files Browse the repository at this point in the history
Added mrbump to the autobuild mock list and updated a few things in t…
  • Loading branch information
hlasimpk committed Aug 13, 2019
2 parents 417ef3a + 44635da commit ee457a5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
Binary file modified docs/_static/flowchart.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@

# If set, mock the import system to have external dependencies
autodoc_mock_imports = [
'clipper', 'pyrvapi', 'cctbx', 'morda', 'iotbx', 'mmtbx', 'parse_molrep', 'parse_refmac', 'phaser'
'clipper', 'pyrvapi', 'cctbx', 'morda', 'iotbx', 'mmtbx', 'parse_molrep', 'parse_refmac', 'phaser', 'mrbump'
]

# Add any paths that contain templates here, relative to this directory.
Expand Down
17 changes: 14 additions & 3 deletions docs/server.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,25 @@
Server
======

A server implementation of SIMBAD is available through CCP4 jsCoFE.
SIMBAD is available through two web-services that make use of the computing resources available at CCP4.

You can access it through CCP4 online:


.. raw:: html

<br>
<div>
<a href="http://ccp4serv6.rc-harwell.ac.uk/jscofe/" class="btn btn-primary btn-lg">Go to CCP4 jsCoFE</a>
<a href="https://ccp4serv7.rc-harwell.ac.uk/ccp4online/" class="btn btn-primary btn-lg">Go to CCP4 online</a>
</div>
</br>

This makes some of the most popular protocols available in an easy-to-use form but greater flexibility is accessible through the CCP4 GUIs or the command line.
or through CCP4 cloud:

.. raw:: html

<br>
<div>
<a href="http://ccp4serv6.rc-harwell.ac.uk/jscofe/" class="btn btn-primary btn-lg">Go to CCP4 cloud</a>
</div>
</br>

0 comments on commit ee457a5

Please sign in to comment.