Skip to content

Conversation

@sbesson
Copy link
Member

@sbesson sbesson commented Feb 13, 2013

This is the same as gh-248 but rebased onto develop.


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

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OMERO-merge-develop#164. See the console output for more details.

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OMERO-merge-develop#165. See the console output for more details.

@snoopycrimecop
Copy link
Member

Conflicting PR. Removed from build OMERO-merge-develop#166. See the console output for more details.

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`
@qidane
Copy link
Contributor

qidane commented Feb 14, 2013

Built fine, check index, skimmed through other pages, looks ok.

As rebase, should be ready to merge.

@joshmoore
Copy link
Member

Thanks, guys.

joshmoore added a commit that referenced this pull request Feb 14, 2013
Command formatting (see #10213) (rebased onto develop)
@joshmoore joshmoore merged commit 4272f06 into ome:develop Feb 14, 2013
@sbesson sbesson deleted the rebased/develop/command_formatting branch February 14, 2013 15:46
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.

4 participants