diff --git a/man/wire.1 b/man/wire.1 index 6eb31f5..282e852 100644 --- a/man/wire.1 +++ b/man/wire.1 @@ -41,10 +41,10 @@ is a screen-oriented Wired client. It is used to connect to Wired servers. At startup, .Nm wire will read -.Pa ~/.wire/config +.Pa ~/.wire2/config and interpret and execute each line as a command. Similarly, if a named bookmark is given as an argument to .Nm wire , -.Pa ~/.wire/bookmark +.Pa ~/.wire2/bookmark will also be read and interpreted. Note that commands in bookmarks should not be prepended by a .Sq / character. @@ -127,7 +127,7 @@ Loads a custom icon from an image file. It is recommended that the image is in P .Nm wire , but only in other graphical clients. .Pp -Example: /icon ~/.wire/icon.png +Example: /icon ~/.wire2/icon.png .Pp .It Nm ignore Op Ar nick Manage user ignores. Without arguments, shows the current list of ignores, identified by id. With an argument, adds a user to the list. No chat or messages are printed from users whose nicks match an entry in the ignore list. @@ -153,7 +153,7 @@ See also: .Nm ban .It Nm load Ar bookmark Loads a bookmark with the name provided from -.Pa ~/.wire/ . +.Pa ~/.wire2/ . .Pp Example: /load myserver .It Nm log Ar filename @@ -243,7 +243,7 @@ Deletes the path. Example: /rm /Uploads .It Nm save Ar bookmark Saves the current settings and connection as a bookmark in -.Pa ~/.wire/ . +.Pa ~/.wire2/ . .Pp Example: /save myserver .It Nm search Ar query @@ -312,9 +312,9 @@ Example: /who .El .Sh FILES .Bl -tag -width -.It Pa ~/.wire/config +.It Pa ~/.wire2/config Default configuration file. Read at startup. Consists of a newline separated list of commands. -.It Pa ~/.wire/bookmark +.It Pa ~/.wire2/bookmark A named bookmark. Read at startup if .Ar bookmark is specified. Read at runtime using the diff --git a/wire/commands.c b/wire/commands.c index de92ff5..6160579 100644 --- a/wire/commands.c +++ b/wire/commands.c @@ -169,7 +169,7 @@ static wr_commands_t wr_commands[] = { false, 1, -1, WR_COMPLETER_COMMAND, wr_command_open }, { "load", - true, "Load the bookmark from the ~/.wire/ directory", "", + true, "Load the bookmark from the ~/.wire2/ directory", "", false, 1, -1, WR_COMPLETER_BOOKMARK, wr_command_load }, { "log", @@ -201,7 +201,7 @@ static wr_commands_t wr_commands[] = { false, 0, -1, WR_COMPLETER_COMMAND, wr_command_quit }, { "save", - true, "Save a bookmark to the ~/.wire/ directory", "", + true, "Save a bookmark to the ~/.wire2/ directory", "", false, 1, -1, WR_COMPLETER_BOOKMARK, wr_command_save }, { "say", diff --git a/wire/main.c b/wire/main.c index 3e7c746..35fc5b7 100644 --- a/wire/main.c +++ b/wire/main.c @@ -184,7 +184,7 @@ Options:\n\ -h display this message\n\ -v display version information\n\ \n\ -If specified, ~/.wire/ is loaded on startup.\n\ +If specified, ~/.wire2 is loaded on startup.\n\ \n\ By Axel Andersson <%s>\n", WR_BUGREPORT); diff --git a/wire/main.h b/wire/main.h index 3939de2..1f17809 100644 --- a/wire/main.h +++ b/wire/main.h @@ -31,8 +31,8 @@ #include -#define WR_WIRE_PATH ".wire" -#define WR_WIRE_CONFIG_PATH ".wire/config" +#define WR_WIRE_PATH ".wire2" +#define WR_WIRE_CONFIG_PATH ".wire2/config" enum _wr_completer { WR_COMPLETER_NONE = 0,