mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-29 06:13:20 +00:00
Harmonize some idiosyncrancies introduced
For now, we are going with ``command`` for builtins and fish scripts, and **keyword** for parser keywords like if or and.
This commit is contained in:
parent
af61ea1325
commit
4c6da2091d
5 changed files with 10 additions and 10 deletions
|
@ -6,7 +6,7 @@ and - conditionally execute a command
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
|
|
||||||
PREVIOUS; ``and`` *COMMAND*
|
PREVIOUS; **and** *COMMAND*
|
||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
|
|
|
@ -8,7 +8,7 @@ Synopsis
|
||||||
|
|
||||||
| loop_construct
|
| loop_construct
|
||||||
| [*COMMANDS* ...]
|
| [*COMMANDS* ...]
|
||||||
| ``break``
|
| **break**
|
||||||
| [*COMMANDS* ...]
|
| [*COMMANDS* ...]
|
||||||
| end
|
| end
|
||||||
|
|
||||||
|
|
|
@ -6,23 +6,23 @@ cd - change directory
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
|
|
||||||
``cd`` [*DIRECTORY*]
|
**cd** [*DIRECTORY*]
|
||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
``cd`` changes the current working directory.
|
**cd** changes the current working directory.
|
||||||
|
|
||||||
If *DIRECTORY* is given, it will become the new directory. If no parameter is given, the :envvar:`HOME` environment variable will be used.
|
If *DIRECTORY* is given, it will become the new directory. If no parameter is given, the :envvar:`HOME` environment variable will be used.
|
||||||
|
|
||||||
If *DIRECTORY* is a relative path, all the paths in the :envvar:`CDPATH` will be tried as prefixes for it, in addition to :envvar:`PWD`.
|
If *DIRECTORY* is a relative path, all the paths in the :envvar:`CDPATH` will be tried as prefixes for it, in addition to :envvar:`PWD`.
|
||||||
It is recommended to keep **.** as the first element of :envvar:`CDPATH`, or :envvar:`PWD` will be tried last.
|
It is recommended to keep **.** as the first element of :envvar:`CDPATH`, or :envvar:`PWD` will be tried last.
|
||||||
|
|
||||||
Fish will also try to change directory if given a command that looks like a directory (starting with **.**, **/** or **~**, or ending with **/**), without explicitly requiring ``cd``.
|
Fish will also try to change directory if given a command that looks like a directory (starting with **.**, **/** or **~**, or ending with **/**), without explicitly requiring **cd**.
|
||||||
|
|
||||||
Fish also ships a wrapper function around the builtin ``cd`` that understands ``cd -`` as changing to the previous directory.
|
Fish also ships a wrapper function around the builtin **cd** that understands ``cd -`` as changing to the previous directory.
|
||||||
See also :ref:`prevd <cmd-prevd>`.
|
See also :ref:`prevd <cmd-prevd>`.
|
||||||
This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables.
|
This wrapper function maintains a history of the 25 most recently visited directories in the ``$dirprev`` and ``$dirnext`` global variables.
|
||||||
If you make those universal variables your ``cd`` history is shared among all fish instances.
|
If you make those universal variables your **cd** history is shared among all fish instances.
|
||||||
|
|
||||||
As a special case, ``cd .`` is equivalent to ``cd $PWD``, which is useful in cases where a mountpoint has been recycled or a directory has been removed and recreated.
|
As a special case, ``cd .`` is equivalent to ``cd $PWD``, which is useful in cases where a mountpoint has been recycled or a directory has been removed and recreated.
|
||||||
|
|
||||||
|
|
|
@ -6,12 +6,12 @@ command - run a program
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
|
|
||||||
``command`` [ *OPTIONS* ] [**COMMAND** [*ARG* ...]]
|
**command** [ **OPTIONS** ] [*COMMANDNAME* [ARG ...]]
|
||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
``command`` forces the shell to execute the program ``COMMANDNAME`` and ignore any functions or builtins with the same name.
|
**command** forces the shell to execute the program *COMMANDNAME* and ignore any functions or builtins with the same name.
|
||||||
|
|
||||||
The following options are available:
|
The following options are available:
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ contains - test if a word is present in a list
|
||||||
Synopsis
|
Synopsis
|
||||||
--------
|
--------
|
||||||
|
|
||||||
``contains`` [**options**] *KEY* [*VALUES* ...]
|
**contains** [**options**] *KEY* [*VALUES* ...]
|
||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
|
|
Loading…
Reference in a new issue