Merge branch 'dev' of https://github.com/AU-Biocommons/django-portal into dev

Author: neoformit

app/home/templates/home/mail/success_admin_user.html

@@ -34,7 +34,7 @@
         The Principal Investigator is ultimately responsible for the hosted Apollo Instance and must ensure all users adhere to the Apollo Service Terms of Use and Policies;
       </li>
       <li>
-        This Service is designed for the long term storage of genome assembly and annotation data. We can guarantee, that the service will be available to the current operational horizon of Australian BioCommons (i.e. June 2023)
+        This Service is designed for the long term storage of genome assembly and annotation data. We can guarantee, that the service will be available to the current operational horizon of Australian BioCommons (i.e. June 2028)
       </li>
       <li>
         The Service is subject to overall storage quota limits and project administrators and users must monitor their volume of large support files (e.g. BAM) and only host these for the duration they are needed; and

app/home/templates/home/mail/success_admin_user.txt

@@ -10,7 +10,7 @@ Please read and familiarise yourself with the Apollo Service Terms of Use and Po
 
 The Service is fully subsidised for research groups / consortia where the Principal Investigator is employed by an Australian-based academic or research institute;
 The Principal Investigator is ultimately responsible for the hosted Apollo Instance and must ensure all users adhere to the Apollo Service Terms of Use and Policies;
-This Service is designed for the long term storage of genome assembly and annotation data. We can guarantee, that the service will be available to the current operational horizon of Australian BioCommons (i.e. June 2023)
+This Service is designed for the long term storage of genome assembly and annotation data. We can guarantee, that the service will be available to the current operational horizon of Australian BioCommons (i.e. June 2028)
 The Service is subject to overall storage quota limits and project administrators and users must monitor their volume of large support files (e.g. BAM) and only host these for the duration they are needed; and
 The Apollo Service is not designed for hosting sensitive data.
 You will be notified with login details once your Instance has been created. Additional user resources are located on the Apollo Service website.

app/home/templates/home/resources/terms.html

@@ -90,7 +90,7 @@ <h3>Apollo Portal</h3>
 
   <h3>Apollo Service</h3>
   <p>
-    The “Apollo Service” (the Service) is offered by the
+    The “Apollo Service” (the Service) is offered by
     <a href="https://www.biocommons.org.au/">
       Australian BioCommons
     </a>
@@ -338,7 +338,7 @@ <h2>
       <strong>Use of service</strong>
       <ol>
         <li>
-          The Apollo Portal and Apollo Service are part of Australian BioCommons
+          The Apollo Portal and Apollo Service are part of Australian BioCommons'
           suite of services that aim to provide fully subsidised access to publicly
           available services. At the discretion of an Apollo Administrator,
           anonymous use by Anonymous (public) Viewers of data is permitted.
@@ -804,13 +804,12 @@ <h2>
   </h2>
 
   <p>
-    The
     <a href="https://www.biocommons.org.au/">
       Australian BioCommons
     </a>
     (hosted by
     <a href="https://www.unimelb.edu.au/">
-      The University of Melbourne
+      the University of Melbourne
     </a>
     ) operates Apollo Portal Service in collaboration with
     <a href="https://www.qcif.edu.au/">
@@ -2276,9 +2275,9 @@ <h2 id="AusUni">List of Australian Research Institutions</h2>
   </p>
   <p>
     <a id="ref_2"> [2] </a>
-    Australian BioCommons initiative is hosted by
+    Australian BioCommons is hosted by
     <a href="https://www.unimelb.edu.au/">
-      The University of Melbourne.
+      the University of Melbourne.
     </a>
   </p>
   <p>