diff --git a/docs/conf.py b/docs/conf.py index 7bd2086..0cc517f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -170,6 +170,7 @@ .. _PyPI: https://pypi.org .. _Conda: https://docs.conda.io/en/latest/ .. _PyTables: http://pytables.org +.. _image.sc: https://forum.image.sc/ .. |SSH| replace:: :abbr:`SSH (Secure Shell)` .. |VM| replace:: :abbr:`VM (Virtual Machine)` diff --git a/docs/jekyll.rst b/docs/jekyll.rst index f5dec3c..dcf2ac7 100644 --- a/docs/jekyll.rst +++ b/docs/jekyll.rst @@ -1,7 +1,7 @@ Jekyll-hosted websites ====================== -The main `OME website `_ is produced using `Jekyll `_. +The main `Open Microscopy Environment`_ website is produced using `Jekyll `_. Installing Jekyll ----------------- @@ -37,7 +37,7 @@ source files, and will override any `baseurl` defined in `_config.yml`. Editing the website ------------------- -The source for the `OME website `_ is +The source for the `Open Microscopy Environment`_ website is on GitHub at https://github.com/ome/www.openmicroscopy.org. The website uses the ‘master’ branch, PRs should be opened directly against it. Most of the files are written in html but the announcements and blog posts diff --git a/docs/omero-release-process.rst b/docs/omero-release-process.rst index a8ee762..01b2660 100644 --- a/docs/omero-release-process.rst +++ b/docs/omero-release-process.rst @@ -6,7 +6,6 @@ OMERO.server release .. _OMERO Server Docker: https://github.com/ome/omero-server-docker .. _OMERO Documentation: https://github.com/ome/omero-documentation/ .. _Read The Docs: https://readthedocs.org/projects/omero/builds/ -.. _image.sc: https://forum.image.sc/ This document describes the release process for OMERO_ server. The release process uses GitHub actions, make sure that the actions are active before pushing any tag. @@ -106,6 +105,6 @@ An hourly cron job runs on our virtual machine and deploys the website. Finally - Add an entry in https://docs.google.com/spreadsheets/d/1K7ab1UpuiE3FmAq3et7OpyxFwumrT7z8tGrDDBSDxsk/edit#gid=908994883 - - Announce the release on `image.sc `_ using the ``Announcements`` category after checking that the website has been deployed. + - Announce the release on `image.sc`_ using the ``Announcements`` category after checking that the website has been deployed. diff --git a/docs/omero-web-release-process.rst b/docs/omero-web-release-process.rst index ca6d68a..63fe45c 100644 --- a/docs/omero-web-release-process.rst +++ b/docs/omero-web-release-process.rst @@ -3,7 +3,6 @@ OMERO.web release .. _OMERO Web: https://github.com/ome/omero-web/ .. _OMERO Web Docker: https://github.com/ome/omero-web-docker/ -.. _image.sc: https://forum.image.sc/ This document describes the release process for `OMERO Web`_. The release process uses GitHub actions, make sure that the actions are **active** before pushing any tag. @@ -54,4 +53,4 @@ Both the `master` branch as well as the tag must be pushed upstream:: An hourly cron job runs on our virtual machine and deploys the website. Finally -- Announce the release on `image.sc `_ using the ``Announcements`` category after checking that the website has been deployed. \ No newline at end of file +- Announce the release on `image.sc`_ using the ``Announcements`` category after checking that the website has been deployed. \ No newline at end of file