1 --- trunk.orig/templates/frontpage
2 +++ trunk/templates/frontpage
4 <h1> Welcome to Memories </h1>
7 - Memories is a site where you can upload and share your photos of
8 - college life with your friends.
9 + Memories is a site where you can upload and share your photos.
12 To view other people's photos, look at the <a
13 --- trunk.orig/templates/header
14 +++ trunk/templates/header
18 - <title> Memories - ANCC Photo Sharing </title>
19 + <title> Memories - Photo Sharing </title>
20 <link title="Maypole" href="[%base%]/static/memories.css" type="text/css" rel="stylesheet"/>
22 <link rel="alternate" type="application/rdf+xml" title="RSS"
23 --- trunk.orig/templates/photo/upload
24 +++ trunk/templates/photo/upload
28 - <title> Memories - ANCC Photo Sharing </title>
29 + <title> Memories - Photo Sharing </title>
30 <link title="Maypole" href="[%base%]/static/memories.css" type="text/css" rel="stylesheet"/>
31 <script type="text/javascript" src="[%base%]/tag/list_js"></script>
32 <script type="text/javascript" src="[%base%]/static/upload.js"></script>