Skip to content

Conversation

@sbesson
Copy link
Member

@sbesson sbesson commented Feb 12, 2013

This PR addresses a discussion thread initialized in #239 and stored in ticket 10213.

Unification of command markup is done as follows:

  • after discussion with @hflynn, all non OMERO command now use the literal :literal:command`` role (double back quotes) instead of the :command: role. All the occurrences of the latter role are reviewed and replaced by the adequate form in the code.
  • to unify the command formatting, the node of the :omerocmd: role is changed into nodes.literal

Additionally, to solve the OS dependency of CLI commands, this PR implements the following:

  • when referring to a command, :omerocmd:admin restart`` now displays omero admin restart in the text and generates a `omero admin; restart` entry in the index table. The latter change allows the proper grouping of all the CLI command in the index.
  • if ones needs to specify the file separator, the :file: role is used assuming the sentence refers to a (relative) file path, e.g. :file:bin/omero or `:file:`bin\\omero

/cc @bpindelski, @ximenesuk

Following a discussion with Helen, we decided to now use the default_role to
mmarkup commands instead of the :command: role.
- omerocmd role is now completely OS independent and :omerocmd:`command subcommand` now displays as  omero command [subcommand]
- when paths are needed, command/omerocmd are converted using file markup, e.g. :file:`bin/omero`
- all other command are marked using the default role, e.g. `command`
README.rst Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

command -> commands

@hflynn
Copy link
Contributor

hflynn commented Feb 12, 2013

Mark up needs to be double back quotes to highlight rather than just make bold!

Copy link
Contributor

Choose a reason for hiding this comment

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

This still needs reformatting to double back quotes

@hflynn
Copy link
Contributor

hflynn commented Feb 12, 2013

Two format updates you missed then this is good to go :)

@hflynn
Copy link
Contributor

hflynn commented Feb 13, 2013

Changes look fine, I expect we'll end up spotting somewhere else we've missed but I think this is good to go for now. Ready to merge.

joshmoore added a commit that referenced this pull request Feb 13, 2013
@joshmoore joshmoore merged commit be7d2bc into ome:dev_4_4 Feb 13, 2013
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.

3 participants