Differences between revisions 14 and 34 (spanning 20 versions)

Welcome to the Saffman research group Wiki

[wiki:Labguide Laboratory guidelines]

[wiki:ResearchProjects Research Projects]

[wiki:OptoMechanics Optical and Mechanical Instruments]

[wiki:Electronics Electronics]

[wiki:vacuum Vacuum preparation]

[wiki:EDB Computing information - hardware and software]

[wiki:Equipment_inventory Equipment inventory and manuals]

[wiki:Purchasing Purchasing]

In order to gain access to the contents of this wiki you will need an account: UserPreferences . It is recommended to use your Madison netID as your user name when registering.

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 34 as of 2011-03-02 01:02:44 → ⇥
  Size: 1047
  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:Labguide Laboratory guidelines]'''
-Line 13:
+Line 15:
-Research Projects
+'''[wiki:ResearchProjects Research Projects]'''
-Line 15:
+Line 17:
-Electronics
-Line 17:
+Line 18:
-Computer hardware and software information
+'''[wiki:OptoMechanics Optical and Mechanical Instruments]'''
-Line 19:
+Line 20:
-Equipment inventory
 Line 21:
-Laboratory guidelines
+'''[wiki:Electronics Electronics]'''
 Line 23:
-Purchasing
+'''[wiki:vacuum Vacuum preparation]'''

'''[wiki:EDB Computing information - hardware and software]'''


'''[wiki:Equipment_inventory Equipment inventory and manuals]'''
-Line 27:
+Line 33:
+'''[wiki:Purchasing Purchasing]'''
-Line 30:
+Line 37:
+----
-Line 32:
+Line 40:
-In order to gain access you will need an account: 
UserPreferences
+In order to gain access to the contents of this wiki you will need an account: 
UserPreferences . It is recommended to use your Madison netID as your user name when registering.
-Line 35:
+Line 43:
-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"

Welcome to the Saffman research group Wiki