Skip to content

Commit

Permalink
Merge pull request #6141 from shonfeder/fix-inline-code-markup
Browse files Browse the repository at this point in the history
Fix markup for inline code in section on `Environment update portability`
  • Loading branch information
kit-ty-kate authored Aug 7, 2024
2 parents e49d5ab + 447d765 commit 73a686a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
16 changes: 8 additions & 8 deletions doc/pages/Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -713,14 +713,14 @@ If a variable is not mentioned in `x-env-path-rewrite`, the separator is assumed
* `PATH` on Windows uses `;` separator and is `target-quoted`

For example, on Windows:
- `[FOO false]`: `FOO` won't be translated nor rewritten, and default separator is used if needed
- `[FOO true]`: `FOO` is rewritten using defaults `;` and `target` with slash rewriting
- `FOO = "a:/path/to"` -> FOO=a:\path\to
- `[FOO ":" "target-quoted"]: `FOO` will be appended using `:` separator, if the added path contains '/' they are transformed into `\`, and if the added path contains a `:`, the added path will be quoted
- `FOO += "a/path/to"` -> FOO=a\path\to:R:\previous\path
- `FOO += "a:path/to"` -> FOO="a:path\to":R:\previous\path
- `[FOO ":" "host"]: `FOO` will be appended using `:`, and its path will be translated according to the host translator, i.e. `cygpath <path>`:
- `FOO += "A:\path\to"` -> FOO=/cygdrive/a/path/to:/previous/path
- `[FOO false]`: `FOO` won't be translated nor rewritten, and default separator is used if needed.
- `[FOO true]`: `FOO` is rewritten using defaults `;` and `target` with slash rewriting. E.g.,
- `FOO = "a:/path/to"` -> `FOO=a:\path\to`
- `[FOO ":" "target-quoted"]`: `FOO` will be appended using `:` separator, if the added path contains `/` they are transformed into `\\`, and if the added path contains a `:`, the added path will be quoted. E.g.,:
- `FOO += "a/path/to"` -> `FOO=a\path\to:R:\previous\path`
- `FOO += "a:path/to"` -> `FOO="a:path\to":R:\previous\path`
- `[FOO ":" "host"]`: `FOO` will be appended using `:`, and its path will be translated according to the host translator, i.e. `cygpath <path>`. E.g.,
- `FOO += "A:\path\to"` -> `FOO=/cygdrive/a/path/to:/previous/path`

### URLs

Expand Down
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ users)
* Fix pinning instructions in readme [#5946 @rjbou - fix #5945]
* Add a brief note about version ordering and an OCaml REPL example [#6119 @mbarbin]
* Update the installation documentation after the release of opam 2.2 [#6138 @kit-ty-kate]
* Fix formatting of inline code in `Environment update portability` section [#6141 @shonfeder]

## Security fixes

Expand Down

0 comments on commit 73a686a

Please sign in to comment.