summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-02 11:52:10 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-02 11:52:10 +0200
commit28edbd1bd57cc62c353d3f94c2dba5c5f9e67c3f (patch)
treee4d9c1c4a61e24e194a70b4cd36976167b38942a
parent26a8febd2b379ca9ea7ba8704cff80810edae04c (diff)
Merge declarations.HEADmaster
-rw-r--r--ikiwiki/website/tech.mdwn85
1 files changed, 23 insertions, 62 deletions
diff --git a/ikiwiki/website/tech.mdwn b/ikiwiki/website/tech.mdwn
index 0f6b54a..69cb8a8 100644
--- a/ikiwiki/website/tech.mdwn
+++ b/ikiwiki/website/tech.mdwn
@@ -21,39 +21,6 @@ and different kinds of users (see also the [[introduction|website]]):
webpages_searchresult [label="search results", style=dotted]
{rank=same; webpages webpages_alt webpages_searchresult}
- /* input data */
- search_query [shape=plaintext, label="search query"]
- txt_editor [shape=plaintext, label="Markdown text"]
- txt_designer [shape=plaintext, label="Markdown text"]
- media [shape=plaintext, label="graphics files"]
- css [shape=plaintext, label="Sass files"]
-// {rank=same; search_query txt_editor txt_designer css media}
-
- /* user tool */
- browser_reader [label="browser"]
- browser_editor [label="browser"]
- browser_designer [label="browser"]
- vcs_txt_local [shape=egg, label="Git repository"]
- vcs_css_local [shape=egg, label="Git repository"]
- fs_local [shape=egg, label="filesystem"]
-
- /* user interface */
- txt_form [label="content editing form", style=dotted]
- search_form [label="search form", style=dotted]
-
- /* storage types */
- vcs_txt [shape=egg, label="Git repository"]
- vcs_css [shape=egg, label="Git repository"]
- fs [shape=egg, label="filesystem"]
- compass [shape=egg, label="Compass libraries"]
-// {rank=same; vcs_txt vcs_css fs compass}
-
- /* stored data */
- search_db [shape=plaintext, label="search index"]
- txt_stored [shape=plaintext, label="Markdown text"]
- media_stored [shape=plaintext, label="graphics files"]
- tmpl_stored [shape=plaintext, label="HTML templates"]
- css_stored [shape=plaintext, label="Sass files"]
/* engines */
css_engine [shape=box, label="Sass CSS renderer"]
@@ -65,47 +32,41 @@ and different kinds of users (see also the [[introduction|website]]):
subgraph cluster_clitools {
label="desktop"
style=dashed
- txt_designer
- css
- media
- vcs_css_local
- vcs_txt_local
- fs_local
+ txt_designer [shape=plaintext, label="Markdown text"]
+ css [shape=plaintext, label="Sass files"]
+ media [shape=plaintext, label="graphics files"]
+ vcs_css_local [shape=egg, label="Git repository"]
+ vcs_txt_local [shape=egg, label="Git repository"]
+ fs_local [shape=egg, label="filesystem"]
}
subgraph cluster_webtools {
label="web"
style=dashed
- txt_editor
- search_query
+ txt_editor [shape=plaintext, label="Markdown text"]
+ search_query [shape=plaintext, label="search query"]
{rank=same
- browser_reader
- browser_editor
- browser_designer
+ browser_reader [label="browser"]
+ browser_editor [label="browser"]
+ browser_designer [label="browser"]
}
{rank=same
- search_form
- txt_form
+ search_form [label="search form", style=dotted]
+ txt_form [label="content editing form", style=dotted]
}
}
subgraph cluster_storage {
label="server"
style=dashed
- vcs_css
- vcs_txt
- fs
- search_db
- txt_stored
- tmpl_stored
- css_stored
- media_stored
- compass
- {
- rank=same
- search_db
- txt_stored
- media_stored
- tmpl_stored
- css_stored
+ vcs_css [shape=egg, label="Git repository"]
+ vcs_txt [shape=egg, label="Git repository"]
+ fs [shape=egg, label="filesystem"]
+ compass [shape=egg, label="Compass libraries"]
+ {rank=same
+ search_db [shape=plaintext, label="search index"]
+ txt_stored [shape=plaintext, label="Markdown text"]
+ media_stored [shape=plaintext, label="graphics files"]
+ tmpl_stored [shape=plaintext, label="HTML templates"]
+ css_stored [shape=plaintext, label="Sass files"]
}
}