Skip to content

Commit

Permalink
Merge branch 'master' into describe-app
Browse files Browse the repository at this point in the history
  • Loading branch information
jdavisp3 committed Feb 9, 2008
2 parents 743bb0c + c681317 commit 137f484
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 10 deletions.
8 changes: 3 additions & 5 deletions _build.cfg
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
project : {
name : faxien
vsn : "0.28.3.0"
vsn : "0.28.3.1"
},

repositories : ["http://repo.martinjlogan.com/pub"],
repositories : ["http://repo.martinjlogan.com/pub", "http://repo.erlware.org/pub"],

dist : {
include_dirs : ["bin", "cmds"]
include_dirs : ["bin"]
}


2 changes: 1 addition & 1 deletion bin/faxien
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PREFIX=$(cd $(dirname $0)/..; pwd)

#### Fill in values for these variables ####
REL_NAME=faxien
REL_VSN=0.28.3.0
REL_VSN=0.28.3.1
ERTS_VSN=5.5.5
INVOCATION_SUFFIX="-s fax_cmdln faxien_apply faxien $@ -s init stop -noshell -prefix $PREFIX"
###########################################
Expand Down
2 changes: 1 addition & 1 deletion lib/faxien/ebin/faxien.app
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{application, faxien,
[{description, "The erlang package management tool."},
{vsn, "0.28.3.0"},
{vsn, "0.28.3.1"},
{modules, [
faxien,
fax_publish,
Expand Down
4 changes: 2 additions & 2 deletions lib/faxien/src/fax_manage.erl
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ format_atom_list(Atoms) ->
%%--------------------------------------------------------------------
%% @private
%% @doc Join list terms together with a separator.
%% @spec join(Items:list(), Sep) -> list()
%% @spec join(Items::list(), Sep) -> list()
%% @end
%%--------------------------------------------------------------------
join(Items, Sep) ->
Expand All @@ -575,7 +575,7 @@ join([Head | Tail], Sep, Acc) ->
%% @doc
%% Text wrap a list of words with the given column width and leading
%% indentation string.
%% @spec wrap(Words:list(), Width:integer(), Indent:string()) -> string()
%% @spec wrap(Words::list(), Width::integer(), Indent::string()) -> string()
%% @end
%%--------------------------------------------------------------------
wrap(Words, Width, Indent) ->
Expand Down
2 changes: 1 addition & 1 deletion lib/faxien/src/faxien.erl
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ upgrade_all_help() ->
%% Install a release and all its applications from a repository. This function will pull down the release tarball for the
%% specified application unpack it, pull down all the applications specified by the included .rel file and finally build
%% a local .boot file used for startup.
%% @spec install(Repos, ReleaseName, ReleaseVsn) -> ok | {error, Reason}
%% @spec install_release(Repos, ReleaseName, ReleaseVsn) -> ok | {error, Reason}
%% where
%% Repos = [string()] | [atom()] | atom()
%% ReleaseName = string() | atom()
Expand Down

0 comments on commit 137f484

Please sign in to comment.