Merge pull request #1717 from tmccombs/doc-better

Doc better

Author: tmccombs

README.md

@@ -298,7 +298,7 @@ This is the output of `fd -h`. To see the full set of command-line options, use
 also includes a much more detailed help text.
 
 ```
-Usage: fd [OPTIONS] [pattern] [path]...
+Usage: fd [OPTIONS] [pattern [path...]]
 
 Arguments:
   [pattern]  the search pattern (a regular expression, unless '--glob' is used; optional)
@@ -335,6 +335,8 @@ Options:
   -V, --version                    Print version
 ```
 
+Note that options can be given after the pattern and/or path as well.
+
 ## Benchmark
 
 Let's search my home folder for files that end in `[0-9].jpg`. It contains ~750.000

doc/fd.1

@@ -18,8 +18,8 @@ fd \- find entries in the filesystem
 .IR num ]
 .RB [ \-x
 .IR cmd ]
-.RI [ pattern ]
-.RI [ path... ]
+.RI [ pattern
+.RI [ path... ]]
 .SH DESCRIPTION
 .B fd
 is a simple, fast and user-friendly alternative to
@@ -34,6 +34,12 @@ By default
 .B fd
 will exclude hidden files and directories, as well as any files that match gitignore rules
 or ignore rules in .ignore or .fdignore files.
+.P
+If you wish to search all files in a specific directory, you can use '' or . as the search pattern,
+to match all files. Or you can use the '\-\-search\-path' option to specify the path(s) instead of
+the positional parameter.
+.P
+Options may be given anywhere on the command line.
 .SH OPTIONS
 .TP
 .B \-H, \-\-hidden
@@ -472,6 +478,10 @@ file in a batch and passed as separate arguments.
 
 If no placeholder is present, an implicit "{}" at the end is assumed.
 
+Like \-\-exec, subsequent arguments are assumed to be part of
+.I command
+until either the end of command arguments or a ';' argument. See above.
+
 Like \-\-exec, this can be used multiple times, in which case each command will be run in
 the order given.