aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc_src/or.txt
diff options
context:
space:
mode:
authorGravatar axel <axel@liljencrantz.se>2006-01-06 01:37:53 +1000
committerGravatar axel <axel@liljencrantz.se>2006-01-06 01:37:53 +1000
commitf6b2b9f9a5a1f527346c7ac37699bca86db65ea2 (patch)
tree24661aa168c83fb182be5709079228c0dd9e0b0b /doc_src/or.txt
parent6a0460f51e9e53d0c009dbfa5b74851d2f1c7095 (diff)
Change syntax of 'and' and 'or' to infix order
darcs-hash:20060105153753-ac50b-4413a5d2652232bb38c97f5c673251193fc848ec.gz
Diffstat (limited to 'doc_src/or.txt')
-rw-r--r--doc_src/or.txt12
1 files changed, 3 insertions, 9 deletions
diff --git a/doc_src/or.txt b/doc_src/or.txt
index 3fc40f3c..d84e8286 100644
--- a/doc_src/or.txt
+++ b/doc_src/or.txt
@@ -2,22 +2,16 @@
\section or or - Conditionally execute a command
\subsection or-synopsis Synopsis
- <tt>or COMMAND1; COMMAND2</tt>
+ <tt>COMMAND1; or COMMAND2</tt>
\subsection or-description Description
-The \c or builtin is used to execute one command, and if it returns
-non-zero status, also execute a second command.
+The \c or builtin is used to execute a command if the current exit status (as set by the last previous command) is non-zero
\subsection or-example Example
The following code runs the \c make command to build a program, or if it fails, it runs <tt>make clean</tt>, which removes the files created by the build process
<pre>
-or make; make clean
+make; or make clean
</pre>
-\c or and \c and can be nested, as in this example, that attempts to build and install a program, and removed the files created by the build process on failiure
-
-<pre>
-or and make; make install; make clean
-</pre>