1 files changed, 18 insertions, 34 deletions
diff --git a/Lysator/WWW.wiki b/Lysator/WWW.wiki
index 656a0f0..e8c5866 100644
--- a/Lysator/WWW.wiki
+++ b/Lysator/WWW.wiki
@@ -1,21 +1,22 @@
 = Contents =
   - [[#Installationen|Installationen]]
   - [[#Anteckningar|Anteckningar]]
+    - [[#Anteckningar#Nya WWW|Nya WWW]]
     - [[#Anteckningar#/lysator/lyswww/|/lysator/lyswww/]]
       - [[#Anteckningar#/lysator/lyswww/#files|files]]
       - [[#Anteckningar#/lysator/lyswww/#main|main]]
-      - [[#Anteckningar#/lysator/lyswww/#projects|projects]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#front|front]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#planet|planet]]
-        - [[#Anteckningar#/lysator/lyswww/#projects#roxen|roxen]]
-      - [[#Anteckningar#/lysator/lyswww/#users|users]]
-    - [[#Anteckningar#Nya WWW|Nya WWW]]
-    - [[#Anteckningar#DNS|DNS]]
 
 = Installationen =
 
 Roxen @ `/opt/roxen`, due to roxen doing its own thing.
 
+Roxen
+:25980 - admin interface
+:8080  - HTTP
+    Serving filesystem under
+    `/srv/www/projects/roxen`
+
+
 = Anteckningar =
 
 llvm direkt på disken
@@ -30,6 +31,10 @@ lvcreate -L 1000G www
 mkfs.ext4 /dev/www/lvol0
 }}}
 
+== Nya WWW ==
+Flytta protokoll till att ligga där man förväntar sig
+Alltså, filer bör ligga nära där de visas
+
 == /lysator/lyswww/ ==
 === files ===
 Old stuff, remove? 
@@ -40,30 +45,9 @@ Contains symblink to `/mp/lyswww-main-static_pages`, which is
 
 `/srv/www/main` on nyarlathotep is the working dir of LysCMS.
 
-=== projects ===
-
-==== front ====
-
-Contains some files which might be linked to from somewhere.
-
-Probably remove this.
-
-==== planet ====
-
-Planet Lysator.
-
-==== roxen ====
-
-https://knuth.lysator.liu.se:25980
-
-Just about everything else. Might need a (later) cleanup.
-
-=== users ===
-`~<user>/.public`
-
-== Nya WWW ==
-Flytta protokoll till att ligga där man förväntar sig
-
-
-== DNS ==
-lsff.nu proxy-pass nginx
+- `projects/front`
+  Contains some files which might be linked to from somewhere.
+  Probably remove this.
+- `projects/roxen`
+- `users` -- `~<user>/.public`
+- `planet`