Merge branch 'master' of ssh://bernie@sunjammer.codewiz.org/~/wiki/git/wiki

diff --git a/EditingTips b/EditingTips
index 79fa3761715bebe6353c4039af2dfefe56ab4549..7847d78530c58a9a564aa9b7ff6b1c4a91ffb4cf 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -9,13 +9,8 @@ See WikiDesignPrinciples.
 
 == Links ==
 
-Names of pages have to LookLikeThis.
-It's called a WikiName.
-If you write a word that LooksLikeThis, it will be automatically turned into a link.
-
-You can use URLs directly: http://www.codewiz.org/ ,
+You can Link to URLs by enclosing them in double square brackets: [[http://www.codewiz.org/]],
 or you can make descriptive links with [[http://www.codewiz.org/ | some anchor text]].
-Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 

diff --git a/memo/benchmark/x200s b/memo/benchmark/x200s
new file mode 100644 (file)
index 0000000..de61e85
--- /dev/null
+++ b/memo/benchmark/x200s
@@ -0,0 +1,29 @@
+== Giskard x200s powertop ==
+
+=== 2.6.31.1-56.fc12 w/ iwlagn ===
+|| BT  || WiFi || LCD || CPU   || **Power** || **Time (3 cell)** ||
+|| off || off  || min || idle  ||  8.4W     || 2.9h              ||
+|| off || on   || min || idle  || 10.4W     || 2.3h              ||
+|| off || on   || max || idle  || 13.4W     || 1.7h              ||
+|| on  || on   || max || idle  || 13.6W     || 1.6h              ||
+|| on  || on   || max || one   || 20.7W     || 1.1h              ||
+|| on  || on   || max || both  || 22.9W     || 0.9h              ||
+
+ * iwlagn uses: 2W
+
+=== 2.6.31.1-56.fc12 w/ ath9k ===
+|| BT  || WiFi  || LCD || CPU   || **Power** ||
+|| off || off   || min || idle  ||  9.0W     ||
+|| off || unass || min || idle  ||  9.5W     ||
+|| off || on    || min || idle  || 10.0W     ||
+|| off || on    || off || idle  ||  8.3W     ||
+
+ * ath9k uses: 2W
+
+=== 2.6.31.1.bernie w/ iwlagn ===
+|| BT  || WiFi  || LCD || CPU   || **Power** || Notes               ||
+|| off || on    || min || idle  || 11.4W     ||                     ||
+|| off || off   || min || idle  ||  9.4W     ||                     ||
+|| off || off   || min || idle  ||  9.0W     || KILL FIREFOX!       ||
+|| off || off   || min || idle  ||  8.8W     || after some time...  ||
+|| off || off   || off || idle  ||  8.7W     || after some time...  ||