Index: openacs-4/packages/acs-core-docs/www/eng-standards-filenaming.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-core-docs/www/eng-standards-filenaming.html,v
diff -u -r1.48.2.12 -r1.48.2.13
--- openacs-4/packages/acs-core-docs/www/eng-standards-filenaming.html	19 Nov 2016 09:21:53 -0000	1.48.2.12
+++ openacs-4/packages/acs-core-docs/www/eng-standards-filenaming.html	6 Jan 2017 09:18:41 -0000	1.48.2.13
@@ -14,11 +14,11 @@
 </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>For naming files that enable a specific action on an object, use this format:</p><div class="blockquote"><blockquote class="blockquote"><p>
 <span class="emphasis"><em><code class="computeroutput">object-verb.extension</code></em></span>
 </p></blockquote></div><p>
-For example, the page to erase a user&#39;s portrait from the database is
+For example, the page to erase a user's portrait from the database is
 <code class="computeroutput">/admin/users/portrait-erase.tcl</code>.
 </p></li><li class="listitem"><p>However, modules typically deal with only one primary type of object -
 e.g.,
-the Bookmarks module deals mainly with bookmarks - and so action-type files in modules don&#39;t need to be specified by the object they act on.  Example: the user pages
+the Bookmarks module deals mainly with bookmarks - and so action-type files in modules don't need to be specified by the object they act on.  Example: the user pages
 for the Bookmarks module live in the <code class="computeroutput">/bookmarks/</code>
 directory, and so there is no need to name the bookmark editing page with a redundant url: <code class="computeroutput">/bookmarks/bookmark-edit.tcl</code>. Instead, we omit the object type, and use this convention:
 </p><div class="blockquote"><blockquote class="blockquote"><p>
@@ -104,9 +104,9 @@
 # www/register/user-login-2.tcl
 
 ad_page_contract {
-    Verify the user&#39;s password and issue the cookie.
+    Verify the user's password and issue the cookie.
     
-    @param user_id The user&#39;s id in users table.
+    @param user_id The user's id in users table.
     @param password_from_from The password the user entered.
     @param return_url What url to return to after successful login.
     @param persistent_cookie_p Specifies whether a cookie should be set to keep the user logged in forever.
@@ -128,7 +128,7 @@
 e.g. <code class="computeroutput">foo:integer,multiple,trim</code>. In particular, <code class="computeroutput">multiple</code> and
 <code class="computeroutput">array</code> are the flags that correspond to the old
 <code class="computeroutput">ad_page_variables</code> flags.</p></li><li class="listitem"><p>There are new flags: <code class="computeroutput">trim</code>, <code class="computeroutput">notnull</code> and
-<code class="computeroutput">optional</code>. They do what you&#39;d expect; values will not be
+<code class="computeroutput">optional</code>. They do what you'd expect; values will not be
 trimmed, unless you mark them for it; empty strings are valid input, unless
 you specify notnull; and a specified variable will be considered required,
 unless you declare it optional.</p></li><li class="listitem"><p><code class="computeroutput">ad_page_contract</code> can do validation for you: the flags <code class="computeroutput">integer</code>
@@ -144,7 +144,7 @@
 For shared Tcl library files, use <a class="link" href="tcl-doc.html#tcl-doc-ad-library" title="ad_library"><code class="computeroutput">ad_library</code></a> after
 the file path comment. Its only argument is a doc_string in the
 standard (javadoc-style) format, like
-<code class="computeroutput">ad_page_contract</code>. Don&#39;t forget to put the @cvs-id in
+<code class="computeroutput">ad_page_contract</code>. Don't forget to put the @cvs-id in
 there.  Here is an example of using ad_library:
 </p><pre class="programlisting">
 # tcl/wp-defs.tcl
@@ -160,7 +160,7 @@
 </p><pre class="programlisting">
 -- <span class="emphasis"><em>path relative to the ACS root directory</em></span>
 --
--- <span class="emphasis"><em>brief description of the file&#39;s purpose</em></span>
+-- <span class="emphasis"><em>brief description of the file's purpose</em></span>
 --
 -- <span class="emphasis"><em>author</em></span>
 -- <span class="emphasis"><em>created</em></span>
@@ -206,7 +206,7 @@
 resource (namely, a database handle) for an unpredictable amount of
 time while sending packets back to the browser, and so it should be
 avoided in most cases. (On the other hand, for a page that requires an
-expensive database query, it&#39;s better to call
+expensive database query, it's better to call
 
 <code class="computeroutput">ad_return_top_of_page</code>