Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / users / ivan_shmakov.mdwn

diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn
index 3dd29708602b42ec4f63c8070ad2a4509d40560a..ed3863717f92410353d90aeb633c8b3f881d351f 100644 (file)
--- a/doc/users/ivan_shmakov.mdwn
+++ b/doc/users/ivan_shmakov.mdwn
@@ -1,26 +1,39 @@
 … To put it short: an Ikiwiki newbie.
 
 … To put it short: an Ikiwiki newbie.
 

+[Altai State University]: http://www.asu.ru/

 [Emacs]: http://www.gnu.org/software/emacs/
 [Lynx]: http://lynx.isc.org/
 [Emacs]: http://www.gnu.org/software/emacs/
 [Lynx]: http://lynx.isc.org/

+[Software Freedom Day]: http://sf-day.org/

 
 ## Wikis
 
 Currently, I run a few Ikiwiki instances.  Namely:
 
 
 ## Wikis
 
 Currently, I run a few Ikiwiki instances.  Namely:
 

-* <http://lhc.am-1.org/lhc/>
-  &mdash; to hold random stuff written by me, my colleagues,
-  students, etc.
+* <http://sfd.am-1.org/>
+  &mdash; [Software Freedom Day][]
+  event at [Altai State University][].
+
+* <https://spire.am-1.org/>
+  &mdash; introductory materials
+  on XML, Markdown, Ikiwiki, etc.
+  in Russian.
+
+* <http://am-1.org/~ivan/networks-2011/>
+  &mdash; bits &amp; pieces related to the course on computer
+  networks I've read in 2011.

 
 

-* <http://rsdesne.am-1.org/rsdesne-2010/>
-  &mdash; for some of the materials related to the
+* http://rsdesne.am-1.org/rsdesne-2010/
+  **(down since December, 2012)**
+  &mdash; used to hold some of the materials related to the

   &ldquo;Remote Sensing in Education, Science and National
   Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State
   &ldquo;Remote Sensing in Education, Science and National
   Economy&rdquo; (2010-03-29 &hellip; 2010-04-10, Altai State

-  University) program I've recently participated in as
+  University) program I've participated in as

   an instructor.
 
   an instructor.
 

-* <http://nets.asu591.ru/networks-2011/>
-  &mdash; for bits &amp; pieces related to the course on computer
-  networks I've read in 2011.
+* http://lhc.am-1.org/lhc/
+  **(down since December, 2012)**
+  &mdash; used to hold random stuff written by me, my colleagues,
+  students, etc.

 
 ## Preferences
 
 
 ## Preferences