Index: openacs-4/packages/file-manager/www/doc/design.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-manager/www/doc/design.html,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/file-manager/www/doc/design.html	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/file-manager/www/doc/design.html	28 Mar 2018 17:00:40 -0000	1.2
@@ -66,7 +66,7 @@
 File Manager is fully integrated with CVS (the version control
 system used by all ArsDigita development projects).  All CVS
 transactions are handled by the <a href=/doc/version-control>version
-control</a> application.  If you want to use version control in conjuction
+control</a> application.  If you want to use version control in conjunction
 with a remote repository, make sure you follow the instructions for
 setting up access to a remote repository.<p>
 
@@ -173,4 +173,4 @@
 </ul>
 
 </body>
-</html>
\ No newline at end of file
+</html>