Ver Fonte

Merge topic 'doc-tweaks'

311d0376 Help: Document error behavior of file(REMOVE/REMOVE_RECURSE)
77e78af1 Help: Clarify how to run sequential commands in execute_process
Brad King há 9 anos atrás
pai
commit
c88a078d69
2 ficheiros alterados com 6 adições e 2 exclusões
  1. 4 1
      Help/command/execute_process.rst
  2. 2 1
      Help/command/file.rst

+ 4 - 1
Help/command/execute_process.rst

@@ -20,7 +20,7 @@ Execute one or more child processes.
                   [OUTPUT_STRIP_TRAILING_WHITESPACE]
                   [OUTPUT_STRIP_TRAILING_WHITESPACE]
                   [ERROR_STRIP_TRAILING_WHITESPACE])
                   [ERROR_STRIP_TRAILING_WHITESPACE])
 
 
-Runs the given sequence of one or more commands with the standard
+Runs the given sequence of one or more commands in parallel with the standard
 output of each process piped to the standard input of the next.
 output of each process piped to the standard input of the next.
 A single standard error pipe is used for all processes.
 A single standard error pipe is used for all processes.
 
 
@@ -36,6 +36,9 @@ Options:
  (Use the ``INPUT_*``, ``OUTPUT_*``, and ``ERROR_*`` options to
  (Use the ``INPUT_*``, ``OUTPUT_*``, and ``ERROR_*`` options to
  redirect stdin, stdout, and stderr.)
  redirect stdin, stdout, and stderr.)
 
 
+ If a sequential execution of multiple commands is required, use multiple
+ :command:`execute_process` calls with a single ``COMMAND`` argument.
+
 ``WORKING_DIRECTORY``
 ``WORKING_DIRECTORY``
  The named directory will be set as the current working directory of
  The named directory will be set as the current working directory of
  the child processes.
  the child processes.

+ 2 - 1
Help/command/file.rst

@@ -153,7 +153,8 @@ Move a file or directory within a filesystem from ``<oldname>`` to
   file(REMOVE_RECURSE [<files>...])
   file(REMOVE_RECURSE [<files>...])
 
 
 Remove the given files.  The ``REMOVE_RECURSE`` mode will remove the given
 Remove the given files.  The ``REMOVE_RECURSE`` mode will remove the given
-files and directories, also non-empty directories
+files and directories, also non-empty directories. No error is emitted if a
+given file does not exist.
 
 
 ------------------------------------------------------------------------------
 ------------------------------------------------------------------------------