diff options
| author | Friendika <info@friendika.com> | 2011-09-27 01:00:31 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-27 01:00:31 -0700 |
| commit | 069a76bff4d635e65ccfd27dcf81bf3531fbfc61 (patch) | |
| tree | eeedebd53ce95c5fe1d63600bdd967c627fe5cb5 | |
| parent | 8d3910c78ce0f84d174baceda3ba8162b8338381 (diff) | |
| parent | 7f02617517f16b5a26a8de66792c7cd028f9b195 (diff) | |
| download | volse-hubzilla-069a76bff4d635e65ccfd27dcf81bf3531fbfc61.tar.gz volse-hubzilla-069a76bff4d635e65ccfd27dcf81bf3531fbfc61.tar.bz2 volse-hubzilla-069a76bff4d635e65ccfd27dcf81bf3531fbfc61.zip | |
Merge branch 'pull'
| -rw-r--r-- | doc/Developers.md | 2 | ||||
| -rw-r--r-- | doc/Install.md | 30 |
2 files changed, 23 insertions, 9 deletions
diff --git a/doc/Developers.md b/doc/Developers.md index ebfaf97c3..744a76a8b 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -7,7 +7,7 @@ doing development. Create your own github account. -You may fork/clone the Friendika repository from [https://github.com/friendika/friendika.git](https://github.com/friendika/friendika.git). +You may fork/clone the Friendika repository from [https://github.com/friendika/Free-Friendika.git](https://github.com/friendika/Free-Friendika.git). Follow the instructions provided here: [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) to create and use your own tracking fork on github diff --git a/doc/Install.md b/doc/Install.md index 3538d7bfa..b5ab1ef6f 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -36,14 +36,28 @@ you might have trouble getting everything to work.] - If you are able to do so, we recommend using git to clone the source repository rather than to use a packaged tar or zip file. This makes the software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - `git clone http://github.com/friendika/friendika.git mywebsite` - - and then you can pick up the latest changes at any time with - - `git pull` - - - + `git clone https://github.com/friendika/Free-Friendika.git mywebsite` + + - and then you can pick up the latest changes at any time with + + `git pull` + + - For installing addons + + - First you should be **on** your website folder + + `cd mywebsite` + + - Then you should clone the addon repository (separtely) + + `git clone https://github.com/friendika/friendika-addons.git addon` + + - For keeping the addon tree updated, you should be on you addon tree and issue a git pull + + `cd mywebsite/addon` + + `git pull` + - If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden and aren't normally copied. |