summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-03-10 19:30:24 +0000
committerintrigeri <intrigeri@boum.org>2016-03-10 19:30:24 +0000
commitbeec771529e62062344dc46816088e95232a75fb (patch)
tree92a8dbd37232e0cb78a928640b2a033c0b42de27
parentaaf9c78fa3c6caa7278509fc324aeab090a5c135 (diff)
parent97d628c0a851bdc46baaa82c12279ffe0bd7fb90 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn6
-rw-r--r--wiki/src/news/report_2016_02.mdwn2
2 files changed, 4 insertions, 4 deletions
diff --git a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
index 78e7df9..44ce19e 100644
--- a/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
+++ b/wiki/src/blueprint/greeter_revamp_UI/design_rationale_phase1.mdwn
@@ -58,10 +58,10 @@ Design a greeter dialog that:
A single welcome and settings screen, which is always displayed, that acts as a "Check & Go" screen, as well as a hub for editing settings.
-<img src="https://labs.riseup.net/code/attachments/download/984/Greeter.Explained.png" width="100%" height="auto" />
+<img src="https://labs.riseup.net/code/attachments/download/1279/Greeter.Explained.png" width="100%" height="auto" />
-[full size bitmap](https://labs.riseup.net/code/attachments/download/984/Greeter.Explained.png)
-[source](https://labs.riseup.net/code/attachments/download/985/Greeter.Explained.svgz)
+[full size bitmap](https://labs.riseup.net/code/attachments/download/1279/Greeter.Explained.png)
+[source](https://labs.riseup.net/code/attachments/download/1280/Greeter.Explained.svgz)
<img src="https://labs.riseup.net/code/attachments/download/979/Greeter.States.png" width="100%" height="auto" />
diff --git a/wiki/src/news/report_2016_02.mdwn b/wiki/src/news/report_2016_02.mdwn
index ad1b1db..b1f4457 100644
--- a/wiki/src/news/report_2016_02.mdwn
+++ b/wiki/src/news/report_2016_02.mdwn
@@ -69,7 +69,7 @@ bugs, a high maintenance burden, and difficulties to be extended since
it doesn't scale well with complexity. A lot of people (us included)
delude themselves with that they know the shell, but it is a
complicated mess with really strange "features" and conventions that
-fee truly understand.
+few truly understand.
Therefore we have started an effort to
[[!tails_ticket 11198 desc="port our shell script to Python"]]