Differences between revisions 14 and 24 (spanning 10 versions)

Welcome to the Saffman research group Wiki

[wiki:ResearchProjects Research Projects]

["Electronics"]

[wiki:OptoMechanics Optical and Mechanical Instruments]

["Computer hardware and software"]

["Equipment inventory"]

["Laboratory guidelines"]

["Purchasing"]

In order to gain access to the contents of this wiki you will need an account: UserPreferences

Then email Mark at msaffman@wisc.edu to have him enable your access.

-  ⇤ ← Revision 14 as of 2011-03-01 17:15:46 → 
  Size: 654
  Editor: msaffman
  Comment:
+   ← Revision 24 as of 2011-03-01 20:38:19 → ⇥
  Size: 819
  Editor: msaffman
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 5:
-#acl msaffman:read,write,delete,revert,admin SaffmanGroup:read,write,revert All:read
+#acl msaffman:read,write,delete,revert,admin SaffmanGroup:read All:read
 Line 10:
-'''Welcome to the Saffman research group Wiki'''
+= Welcome to the Saffman research group Wiki =
----

'''[wiki:ResearchProjects Research Projects]'''
-Line 13:
+Line 16:
-Research Projects
+'''["Electronics"]'''
-Line 15:
+Line 18:
-Electronics

Computer hardware and software information

Equipment inventory

Laboratory guidelines

Purchasing
+'''[wiki:OptoMechanics Optical and Mechanical Instruments]'''
-Line 27:
+Line 22:
+'''["Computer hardware and software"]'''

'''["Equipment inventory"]'''

'''["Laboratory guidelines"]'''

'''["Purchasing"]'''
-Line 30:
+Line 32:
+----
-Line 32:
+Line 35:
-In order to gain access you will need an account:
+In order to gain access to the contents of this wiki you will need an account:
-Line 35:
+Line 38:
-Then email Mark at msaffman@wisc.edu to enable your access.
+Then email Mark at msaffman@wisc.edu to have him enable your access.

saffmanwiki: Diff for "FrontPage"