[tor-commits] [ooni-probe/master] Add birdseye view of the ooniprobe architecture

[art at torproject.org]

commit 7f7d8a63e499ccb7e4ca7b6576d5a6f83eb78574
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Dec 21 20:38:38 2012 +0100

    Add birdseye view of the ooniprobe architecture
    (cherry picked from commit 07329ef9e2ad5a54af8d66aa97669bfeeb359916)
---
 .../_static/images/ooniprobe-architecture.png      |  Bin 0 -> 96574 bytes
 docs/source/architecture.rst                       |    5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/source/_static/images/ooniprobe-architecture.png b/docs/source/_static/images/ooniprobe-architecture.png
new file mode 100644
index 0000000..06065fc
Binary files /dev/null and b/docs/source/_static/images/ooniprobe-architecture.png differ
diff --git a/docs/source/architecture.rst b/docs/source/architecture.rst
index f0736ce..cb50402 100644
--- a/docs/source/architecture.rst
+++ b/docs/source/architecture.rst
@@ -4,8 +4,6 @@ Architecture
 :Contact: art at torproject.org
 :Copyright: This document has been placed in the public domain.
 
-.. [[Image(https://github.com/hellais/ooni-docsnspecs/raw/master/graphics/CnCView.png, width=550px, align=right)]]
-
 The goal of this document is provide an overview of how ooni works, what are
 it's pieces and how they interact with one another.
 
@@ -16,6 +14,9 @@ To get an idea of what is implemented and with what sort of quality see the
 
 The two main components of ooni are `oonib`_ and `ooniprobe`_.
 
+.. image:: _static/images/ooniprobe-architecture.png
+    :width: 700px
+
 ooniprobe
 ---------