diff options
| author | Hans Bolinder <[email protected]> | 2018-08-27 15:59:23 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-08-27 15:59:23 +0200 |
| commit | 0960ef90d717f5851037903b81e364fae1a43cdf (patch) | |
| tree | 237be5fd214d254b874db84841c38ab554bb8aa5 /lib/stdlib/doc/src | |
| parent | 4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a (diff) | |
| parent | b47fa83ff514feafa3debe841f2697c29fa2ca49 (diff) | |
| download | otp-0960ef90d717f5851037903b81e364fae1a43cdf.tar.gz otp-0960ef90d717f5851037903b81e364fae1a43cdf.tar.bz2 otp-0960ef90d717f5851037903b81e364fae1a43cdf.zip | |
Merge branch 'maint'
* maint:
Document allowed integer ops in types
stdlib: Fix specs of filename:basedir/2,2
Diffstat (limited to 'lib/stdlib/doc/src')
| -rw-r--r-- | lib/stdlib/doc/src/filename.xml | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index ce19f70df0..36254c2d00 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -84,11 +84,6 @@ reject such filenames. </p></warning> </description> - <datatypes> - <datatype> - <name name="basedir_type"/> - </datatype> - </datatypes> <funcs> <func> @@ -149,18 +144,37 @@ </func> <func> - <name name="basedir" arity="2"/> - <fsummary>Equivalent to <c>basedir(<anno>Type</anno>,<anno>Application</anno>,#{})</c>.</fsummary> + <name name="basedir" arity="2" clause_i="1"/> + <name name="basedir" arity="2" clause_i="2"/> + <fsummary>Equivalent to <c>basedir(<anno>PathType</anno>, + <anno>Application</anno>,#{})</c> or + <c>basedir(<anno>PathsType</anno>, <anno>Application</anno>,#{})</c>. + </fsummary> + <type variable="PathType" name_i="1"/> + <type name="basedir_path_type"/> + <type variable="PathsType" name_i="2"/> + <type name="basedir_paths_type"/> + <type variable="Application"/> <desc> <p> - Equivalent to <seealso marker="#basedir-3"> - basedir(<anno>Type</anno>, <anno>Application</anno>, #{})</seealso>. + Equivalent to <seealso marker="#basedir_3_1"> + basedir(<anno>PathType</anno>, <anno>Application</anno>, #{})</seealso> + or <seealso marker="#basedir_3_2"> +basedir(<anno>PathsType</anno>, <anno>Application</anno>, #{})</seealso>. </p> </desc> </func> <func> - <name name="basedir" arity="3"/> + <name name="basedir" arity="3" clause_i="1" anchor="basedir_3_1"/> + <name name="basedir" arity="3" clause_i="2" anchor="basedir_3_2"/> <fsummary></fsummary> + <type variable="PathType" name_i="1"/> + <type name="basedir_path_type"/> + <type variable="PathsType" name_i="2"/> + <type name="basedir_paths_type"/> + <type variable="Application"/> + <type variable="Opts"/> + <type name="basedir_opts"/> <desc><marker id="basedir-3"/> <p> Returns a suitable path, or paths, for a given type. If |