diff options
| author | spalax <spalax@web> | 2014-04-29 04:32:31 -0400 |
|---|---|---|
| committer | admin <admin@branchable.com> | 2014-04-29 04:32:31 -0400 |
| commit | d93ae5a0fc452deff493506ec5a040fb699ba9d5 (patch) | |
| tree | d08dfa98ba1bf30391fd0daa3dd334ce72449fd0 /doc/tips/distributed_wikis | |
| parent | b16fe913ec62f33eb6319552f0e40a3336afbe47 (diff) | |
| download | ikiwiki-d93ae5a0fc452deff493506ec5a040fb699ba9d5.tar ikiwiki-d93ae5a0fc452deff493506ec5a040fb699ba9d5.tar.gz | |
Added reference to pull request, and figure
Diffstat (limited to 'doc/tips/distributed_wikis')
| -rw-r--r-- | doc/tips/distributed_wikis/discussion.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tips/distributed_wikis/discussion.mdwn b/doc/tips/distributed_wikis/discussion.mdwn index 86708a392..9c1d00cba 100644 --- a/doc/tips/distributed_wikis/discussion.mdwn +++ b/doc/tips/distributed_wikis/discussion.mdwn @@ -16,7 +16,7 @@ Would it work if the mirrored wiki was configured with cgiurl set to the cgiurl >> >>> I still don't understand the difference, and I can't reach the URL you have given above. Previously, to upload stuff I created a clone of the git repository and asked joeyh to pull, like [[this|todo/improve_decentralised_wikis_documentation_and_graphics/]]. --[[anarcat]] >>> ->>>> Upload: I am setting up a clone on github and asking joeyh to pull. +>>>> Upload: I have set up a [[clone|https://github.com/paternal/ikiwiki]] on github and asking joeyh to pull: [[branch|https://github.com/paternal/ikiwiki/tree/paternal/upload-svg]], [[pull request|todo/upload__95__figure]], [[figure|https://github.com/paternal/ikiwiki/blob/paternal/upload-svg/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines/separate-web-git-servers.svg]] >>>> >>>> Difference between *Separate webserver and git repository* and *Separate ikiwiki web server, and git server* : the only difference is that in the first case, the git srcdir is on the same server as the git main repository, whereas in the second case, it is present on the same server as the web server. One use case is when one as a very limited access to the server hosting the git repository, and cannot setup the git srcdir (because of, for instance, a (reasonably?) paranoid sysadmins would require the creation of a new user to own the git srcdir). |