Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small text update #1320

Merged
merged 3 commits into from
Oct 30, 2015
Merged

Small text update #1320

merged 3 commits into from
Oct 30, 2015

Conversation

atarkowska
Copy link
Member

updating text as @rleigh-dundee said in #1305

Reads ambiguously to me. "the web framework is no longer shipped with Django" means that Django no longer provides the web framework, when I think this means to say that "the OMERO web framework no longer bundles a copy of Django", which is the opposite way around.

cc: @jburel

@jburel jburel added the develop label Oct 29, 2015
@hflynn
Copy link
Contributor

hflynn commented Oct 29, 2015

Reads better to me

.. note:: Since OMERO 5.2, the web framework is no longer shipped with the
Django package and requires manual installation of the Django dependency.
.. note:: Since OMERO 5.2, the OMERO web framework no longer bundles a copy
of Django package and requires manual installation of the Django dependency.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'a copy of Django package' -> 'a copy of the Django package'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the whole sentence might be better as something like:

Since OMERO 5.2, the OMERO web framework no longer bundles a copy
of the Django package, instead manual installation of the Django dependency
is required.

in both cases.

@atarkowska
Copy link
Member Author

@ximenesuk see now

@jburel jburel mentioned this pull request Oct 30, 2015
@ximenesuk
Copy link
Contributor

This all looks good in the commits. It's probably worth double checking on staging before merging.

@hflynn
Copy link
Contributor

hflynn commented Oct 30, 2015

Staging is fine thanks, merging.

hflynn pushed a commit that referenced this pull request Oct 30, 2015
@hflynn hflynn merged commit 8e942bb into ome:develop Oct 30, 2015
@atarkowska atarkowska deleted the django_upgarde branch October 30, 2015 10:21
@sbesson sbesson added this to the 5.2.0 milestone Nov 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants