[Members] new xmpp.org going live in 7 days

Simon Tennant simon at buddycloud.com
Tue Nov 10 09:16:24 UTC 2015


Hi Peter.

Thanks for working on the IoT page. I've commented
<https://github.com/xsf/xmpp.org/pull/87> on the PR. Summary: keep it short
and light and provide links to more detailed content on deeper pages or the
wiki.

Git is pretty good at merging where it can. Another approach that might
help you co-edit would be to throw up a shared Google doc/etherboard and
then copy paste into the marddown page when you are both ready to publish.

S.

On 10 November 2015 at 09:25, Peter Waher <peterwaher at hotmail.com> wrote:

> Excellent.
>
> Tanks Steven & Simon for the info.
>
> I've added a small definition, immediate consequences to motivate an
> outline that I also added. I made a PR for you to view, and test how the
> process works. Let me know if you want to add/change things in the outline,
> etc. I'll continue to write and let you know about the progress. Not sure
> how GitHub handles merging when multiple people edit the same file, so
> perhaps I can finish writing to avoid merge conflicts. If you want to have
> Changes in the file, perhaps it's best if you mailed them to me while I'm
> writing?
>
> Best regards,
> Peter Waher
>
> ------------------------------
> From: lloyd at evilprofessor.co.uk
> Date: Mon, 9 Nov 2015 20:58:52 +0000
> To: members at xmpp.org
> Subject: Re: [Members] new xmpp.org going live in 7 days
>
> In fact you can do this directly on github using the editor. Also: click
> edit, it will fork and create the pull request for you.
>
> _____________________________________________________
>
> Steven Lloyd Watkin
> Software Engineer
> PHP ::: Java ::: Ruby ::: Node.js ::: JavaScript ::: XMPP :: + many more
> lloyd at evilprofessor.co.uk (email+jid) ::: http://www.evilprofessor.co.uk
> Github / Twitter / Flickr / Facebook: lloydwatkin
>
> Organiser of WORLD RECORD breaking charity event:
> Scuba Santas ::: http://www.scuba-santas.co.uk
> Supporting the RNLI & DDRC - NDAC, Chepstow
>
> On 9 November 2015 at 20:05, Simon Tennant <simon at buddycloud.com> wrote:
>
> On 9 November 2015 at 20:33, Peter Waher <peterwaher at hotmail.com> wrote:
>
> Excellent.
> I need to find out who manages the work, and how to get permissions, where
> to edit, or to whom to propose changes, etc. I've been off-line for too
> long it seems. Then we can synchronize our work.
>
>
> Hi Peter, Davide
>
> No permissions needed - I suggest you fork the repository and edit this
> file (
> https://github.com/xsf/xmpp.org/blob/master/content/pages/uses/internet-of-things.md).
> When you are done, just send a pull request.
>
> S.
>
> --
> Simon Tennant | CEO Buddycloud <http://buddycloud.com> | +49 17 8545 0880
> | Meet <https://calendly.com/simon-tennant/buddycloud-call>
>
>
>


-- 
Simon Tennant | CEO Buddycloud <http://buddycloud.com> | +49 17 8545 0880 |
Meet <https://calendly.com/simon-tennant/buddycloud-call>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.jabber.org/pipermail/members/attachments/20151110/87e86d3d/attachment.html>


More information about the Members mailing list