Merge remote-tracking branch 'wisebaldone/0.4-WhitePapers' into 0.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave-docs/commit/e14218b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave-docs/tree/e14218b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave-docs/diff/e14218b4 Branch: refs/heads/0.4 Commit: e14218b4a2b08cd7b24880c633b1675ab44b0948 Parents: 608603b e7058bf Author: Ali Lown <a...@lown.me.uk> Authored: Tue Jun 30 01:44:37 2015 +0100 Committer: Ali Lown <a...@lown.me.uk> Committed: Tue Jun 30 01:44:37 2015 +0100 ---------------------------------------------------------------------- Makefile | 2 +- .../protocol/access-control/access-control.rst | 222 +++++++++++++ .../access-control/img/account-canonical.png | Bin 0 -> 9465 bytes .../access-control/img/address-address.png | Bin 0 -> 8932 bytes .../access-control/img/member-group-group.png | Bin 0 -> 19113 bytes .../img/member-group-read-group.png | Bin 0 -> 18268 bytes .../access-control/img/member-group.png | Bin 0 -> 10694 bytes .../access-control/img/member-read-group.png | Bin 0 -> 10012 bytes source/protocol/access-control/img/spelly.png | Bin 0 -> 9910 bytes source/protocol/attachments/attachments.rst | 316 ++++++++++++++++++ .../img/attachment-server-architecture.png | Bin 0 -> 30859 bytes .../client-server-protocol.rst | 333 +++++++++++++++++++ source/protocol/conf.py | 6 +- .../google-wave-architecture.rst | 311 +++++++++++++++++ .../img/acmewave-federati.png | Bin 0 -> 82871 bytes .../img/gateway-and-proxy.png | Bin 0 -> 63445 bytes .../google-wave-architecture/img/love.png | Bin 0 -> 40828 bytes source/protocol/index.rst | 15 +- .../operational-transform/img/annotations.png | Bin 0 -> 10536 bytes .../operational-transform/img/composition.png | Bin 0 -> 7602 bytes .../operational-transform/img/david_ot3.png | Bin 0 -> 28766 bytes .../operational-transform/img/doc-items.png | Bin 0 -> 5769 bytes .../operational-transform/img/ot-paths.png | Bin 0 -> 17779 bytes .../img/transformation.png | Bin 0 -> 8100 bytes .../operational-transform.rst | 228 +++++++++++++ 25 files changed, 1427 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
