diff options
| author | Evan Prodromou <git@evanprodromou.name> | 2009-01-08 16:01:54 -0500 |
|---|---|---|
| committer | Evan Prodromou <git@evanprodromou.name> | 2009-01-08 16:01:54 -0500 |
| commit | 2d456a15e5652a0c0e2c0f9f50221eed2d16e109 (patch) | |
| tree | 9bbb5f582a1ed64800c9440d519e4df09e01d30a /README | |
| parent | 93cb7e07f7aec6cff62c4b51d9fddf5ac46d18ad (diff) | |
| parent | 28d17d8d90b8b15eec2baa19d7c3bfaf5ad057db (diff) | |
Merge branch 'master' of ../laconica-stable
Diffstat (limited to 'README')
| -rw-r--r-- | README | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -667,7 +667,7 @@ Upgrading ========= If you've been using Laconica 0.6, 0.5 or lower, or if you've been -tracking the "darcs" version of the software, you will probably want +tracking the "git" version of the software, you will probably want to upgrade and keep your existing data. There is no automated upgrade procedure in Laconica 0.6.4. Try these step-by-step instructions; read to the end first before trying them. @@ -1068,7 +1068,7 @@ The primary output for Laconica is syslog, unless you configured a separate logfile. This is probably the first place to look if you're getting weird behaviour from Laconica. -If you're tracking the unstable version of Laconica in the darcs +If you're tracking the unstable version of Laconica in the git repository (see below), and you get a compilation error ("unexpected T_STRING") in the browser, check to see that you don't have any conflicts in your code. @@ -1103,12 +1103,12 @@ Unstable version ================ If you're adventurous or impatient, you may want to install the -development version of Laconica. To get it, use the darcs version -control tool (http://darcs.net/) like so: +development version of Laconica. To get it, use the git version +control tool (http://git-scm.com/) like so: - darcs get http://laconi.ca/darcs/ mublog + git clone http://laconi.ca/software/laconica.git -To keep it up-to-date, use 'darcs pull'. Watch for conflicts! +To keep it up-to-date, use 'git pull'. Watch for conflicts! Further information =================== |