Skip to content

Commit

Permalink
Bump documentation references to use omero5.2
Browse files Browse the repository at this point in the history
This commit was produced  by running
$ python components/tools/bump_version.py 5.2
  • Loading branch information
sbesson committed Oct 16, 2015
1 parent 6ada479 commit d497315
Show file tree
Hide file tree
Showing 27 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Also see [CONTRIBUTING.md](./CONTRIBUTING.md)

Full developer documentation for OMERO is available from
http://www.openmicroscopy.org/site/support/omero5.1/developers/
http://www.openmicroscopy.org/site/support/omero5.2/developers/

For general guidance on contributing to OME projects, see
http://www.openmicroscopy.org/site/support/contributing/
Expand Down
4 changes: 2 additions & 2 deletions components/blitz/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
OmeroBlitz
http://www.openmicroscopy.org/site/support/omero5.1/developers/server-blitz.html
http://www.openmicroscopy.org/site/support/omero5.2/developers/server-blitz.html
------------------------------------------------------------------------------

The Blitz server is based on Ice (http://zeroc.com)
Expand All @@ -8,4 +8,4 @@ Contained in this directory are server implementation, code
generation for the client implementation, and configuration
for an IceGrid application.

See also http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/grid.html
See also http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/grid.html
4 changes: 2 additions & 2 deletions components/blitz/resources/omero/API.ice
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@ module omero {
* Returns a reference to a back-end manager. The [omero::grid::SharedResources]
* service provides look ups for various facilities offered by OMERO:
* <ul>
* <li><a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/scripts/">OMERO.scripts</a>
* <li><a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Tables.html">OMERO.tables</a>
* <li><a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/scripts/">OMERO.scripts</a>
* <li><a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Tables.html">OMERO.tables</a>
* </ul>
* These facilities may or may not be available on first request.
*
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/resources/omero/Constants.ice
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ module omero {
};

/**
* General namespaces for <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Modules/StructuredAnnotations.html">StructuredAnnotations</a>
* General namespaces for <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Modules/StructuredAnnotations.html">StructuredAnnotations</a>
**/
module namespaces {
const string NSFSRENAME = "openmicroscopy.org/omero/fs/rename";
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/resources/omero/Scripts.ice
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* implementation, for use by the server and via the
* InteractiveProcessor wrapper by clients.
*
* See http://www.openmicroscopy.org/site/support/omero5.1/developers/scripts/
* See http://www.openmicroscopy.org/site/support/omero5.2/developers/scripts/
*/

module omero {
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/resources/omero/Tables.ice
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* The Tables API is intended to provide a storage mechanism
* for tabular data.
*
* See http://www.openmicroscopy.org/site/support/omero5.1/developers/Tables.html
* See http://www.openmicroscopy.org/site/support/omero5.2/developers/Tables.html
*/
module omero {

Expand Down
2 changes: 1 addition & 1 deletion components/blitz/resources/omero/api/IScript.ice
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module omero {
* proc.close(False)
*
* </pre>
* See <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/scripts/">OMERO.scripts</a> for more information.
* See <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/scripts/">OMERO.scripts</a> for more information.
**/
["ami","amd"] interface IScript extends ServiceInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public static void usage() {
+ " $ %s -s localhost -u username -w password -d 50 --debug ALL foo.tiff\n"
+ "\n"
+ "For additional information, see:\n"
+ "http://www.openmicroscopy.org/site/support/omero5.1/users/cli/import.html\n"
+ "http://www.openmicroscopy.org/site/support/omero5.2/users/cli/import.html\n"
+ "Report bugs to <[email protected]>",
APP_NAME, APP_NAME, APP_NAME, APP_NAME, APP_NAME, APP_NAME));
System.exit(1);
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/src/omero/cmd/graphs/ChgrpFacadeI.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @author [email protected]
* @since 5.1.0
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/src/omero/cmd/graphs/ChmodFacadeI.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @author [email protected]
* @since 5.1.2
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/src/omero/cmd/graphs/ChownFacadeI.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @author [email protected]
* @since 5.1.0
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
2 changes: 1 addition & 1 deletion components/blitz/src/omero/cmd/graphs/DeleteFacadeI.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
* @author [email protected]
* @since 5.1.0
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*
* @since 5.0.0
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
2 changes: 1 addition & 1 deletion components/insight/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
Developing OMERO.insight
------------------------

See http://www.openmicroscopy.org/site/support/omero5.1/developers/index.html#insight
See http://www.openmicroscopy.org/site/support/omero5.2/developers/index.html#insight



Expand Down
2 changes: 1 addition & 1 deletion components/server/src/ome/services/graphs/GraphOpts.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* @author Josh Moore, josh at glencoesoftware.com
* @since Beta4.2.1
* @deprecated will be removed in OMERO 5.3, so use the
* <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/Server/ObjectGraphs.html">new graphs implementation</a>
* <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/Server/ObjectGraphs.html">new graphs implementation</a>
*/
@Deprecated
@SuppressWarnings("deprecation")
Expand Down
2 changes: 1 addition & 1 deletion components/server/src/ome/services/util/DBPatchCheck.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public DBPatchCheck(SqlAction sql, PreferenceContext prefs) {
}

private final static String line = "***************************************************************************************\n";
private final static String see = "See http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/server-upgrade.html\n";
private final static String see = "See http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/server-upgrade.html\n";
private final static String no_table = mk("Error connecting to database table dbpatch. You may need to bootstrap.\n");
private final static String wrong_version = mk("DB version (%s) does not match omero.properties (%s). Please apply a db upgrade.\n");

Expand Down
4 changes: 2 additions & 2 deletions components/tests/ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ OMERO.web

To run the tests locally, you will first need to start OMERO.web, please see

http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/unix/install-web.html
http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/unix/install-web.html

or

http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/windows/install-web.html
http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/windows/install-web.html

for more information.

Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroPy/src/omero/plugins/basics.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def __call__(self, args):
%(topics)s
For additional information, see:
http://www.openmicroscopy.org/site/support/omero5.1/users/cli/index.html
http://www.openmicroscopy.org/site/support/omero5.2/users/cli/index.html
Report bugs to <[email protected]>
"""

Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroPy/src/omero/plugins/group.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def _configure(self, parser):
fail if different users' data is too closely related to be separated.
More information is available at:
http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/\
http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/\
server-permissions.html
"""

Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroPy/src/omero/plugins/import.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
$ bin/omero import -- --debug=ERROR foo.tiff
For additional information, see:
http://www.openmicroscopy.org/site/support/omero5.1/users/cli/import.html
http://www.openmicroscopy.org/site/support/omero5.2/users/cli/import.html
Report bugs to <[email protected]>
"""
TESTHELP = """Run the Importer TestEngine suite (devs-only)"""
Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroWeb/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,5 +70,5 @@ Copyright
.. _OMERO: http://openmicroscopy.org/
.. _PIL: http://www.pythonware.com/products/pil/
.. _Matplotlib: http://matplotlib.org/
.. _Running and writing tests: http://www.openmicroscopy.org/site/support/omero5.1/developers/testing.html
.. _Running and writing tests: http://www.openmicroscopy.org/site/support/omero5.2/developers/testing.html

Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ <h1><a href="{% url 'wagroups' %}" style="position:relative; top:-38px; float:ri

<p>
Full details on various Permissions levels can be found on the
<a href="http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/server-permissions.html" target="new">
<a href="http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/server-permissions.html" target="new">
OMERO Permissions
</a>
page.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h1><a href="{% url 'wamyaccount' "edit" %}" style="position:relative; top:-38px

<p>
Full details on various Permissions levels can be found on the
<a href="http://www.openmicroscopy.org/site/support/omero5.1/sysadmins/server-permissions.html" target="new">
<a href="http://www.openmicroscopy.org/site/support/omero5.2/sysadmins/server-permissions.html" target="new">
OMERO Permissions
</a>
page.
Expand Down
10 changes: 5 additions & 5 deletions docs/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ <h2>Main OMERO API [@VERSION@] Documentation</h2>
</div>
<h2>Related Documentation</h2>
<p>
Further <a href="http://www.openmicroscopy.org/site/support/omero5.1/developers/index.html" target="_top">OMERO developer documentation</a> is available. You may find the following particularly useful:
Further <a href="http://www.openmicroscopy.org/site/support/omero5.2/developers/index.html" target="_top">OMERO developer documentation</a> is available. You may find the following particularly useful:
<ul>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.1/developers/GettingStarted/AdvancedClientDevelopment.html" target="_top">Developing OMERO clients</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.1/developers/Server.html" target="_top">OMERO server overview</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.1/developers/index.html#using-the-omero-api" target="_top">Using the OMERO API</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.1/developers/Model.html" target="_top">OME-Remote Objects</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.2/developers/GettingStarted/AdvancedClientDevelopment.html" target="_top">Developing OMERO clients</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.2/developers/Server.html" target="_top">OMERO server overview</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.2/developers/index.html#using-the-omero-api" target="_top">Using the OMERO API</a></li>
<li><a href="https://www.openmicroscopy.org/site/support/omero5.2/developers/Model.html" target="_top">OME-Remote Objects</a></li>
</ul>

There is also documentation on the <a href="https://www.openmicroscopy.org/site/support/ome-model/" target="_top">OME Data Model</a>.
Expand Down
2 changes: 1 addition & 1 deletion etc/templates/grid/templates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
default if you are seeing "Protocol family unavailable"
errors. To do that, use bin/omero config set Ice.IPv6 0
See https://www.openmicroscopy.org/site/support/omero5.1/sysadmins/troubleshooting.html#server-fails-to-start
See https://www.openmicroscopy.org/site/support/omero5.2/sysadmins/troubleshooting.html#server-fails-to-start
for more information.
-->
<property name="Ice.IPv6" value="0"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/README.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
These examples are intended to complement the documentation available at
http://www.openmicroscopy.org/site/support/omero5.1/developers/GettingStarted/AdvancedClientDevelopment.html.
http://www.openmicroscopy.org/site/support/omero5.2/developers/GettingStarted/AdvancedClientDevelopment.html.
Please refer there for further information.
2 changes: 1 addition & 1 deletion examples/ScriptingService/Edit_Descriptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def editDescriptions(conn, scriptParams):
'Edit_Descriptions.py',
("Edits the descriptions of multiple Images, either specified via"
" Image IDs or by the Dataset IDs.\nSee"
" http://www.openmicroscopy.org/site/support/omero5.1/developers/"
" http://www.openmicroscopy.org/site/support/omero5.2/developers/"
"scripts/user-guide.html for the tutorial that uses this script."),

scripts.String(
Expand Down

0 comments on commit d497315

Please sign in to comment.