merge

lmccart · Apr 12, 2023 · 5793c1c · 5793c1c
1 parent 7b91a04
commit 5793c1c
Showing 1 changed file with 16 additions and 28 deletions.
diff --git a/howtoftp.html b/howtoftp.html
@@ -116,12 +116,22 @@ <h2>Your Personal Webspace</h2>
           do not specify a filename at the end of your URL (eg: <code>
               <a href="http://users.design.ucla.edu/~yourusername" target="_blank">http://users.design.ucla.edu/~ <wbr>yourusername </a>
             </code>). </p>
-<<<<<<< HEAD
-          <p>PLEASE NOTE: if you do not have an <em>index.html</em> file and type the URL without a filename at the end, you will get an error message (access forbidden). This is for your own protection, as it prevents people from browsing through your directory when you are not ready for them to do so. </p>
-          <p>NOTE 1: Permissions File permissions matter. All files in the <em>public_html</em> directory should be world-readable in order to ensure their availability online. Similarly, all directories should be world readable and executable. Most clients will deposit the files in the correct manner, but there have been some reports that moving whole folders from other parts of your home directory to your web area may mess up permissions depending on your client. </p>
-          <p>NOTE 2: CAPITALIZATION MATTERS! That is to say, <code>index.html</code> and <code>iNdex.html</code> are NOT the same files. In order for your site to work properly, you must make sure that both the filenames and the HTML that refers to the filename use the same casing. Since many operating systems by default hide or pretty the actual cases of their filenames, I recommend either turning off those features (if you know how) or use an SFTP client that shows you how the files actually look when uploaded. </p>
-          <p>[ Info in this section comes from <a href="https://support.dma.ucla.edu/help/?q=FrequentlyAskedQuestions" target="_blank">DMA Support</a> ] </p>
-
+
+          <p>PLEASE NOTE: if you do not have an <em>index.html</em> file and type the URL without a filename at the end,
+            you will get an error message (access forbidden). This is for your own protection, as it prevents people from
+            browsing through your directory when you are not ready for them to do so. </p>
+          <p>NOTE 1: Permissions File permissions matter. All files in the <em>public_html</em> directory should be
+            world-readable in order to ensure their availability online. Similarly, all directories should be world
+            readable and executable. Most clients will deposit the files in the correct manner, but there have been some
+            reports that moving whole folders from other parts of your home directory to your web area may mess up
+            permissions depending on your client. </p>
+          <p>NOTE 2: CAPITALIZATION MATTERS! That is to say, <code>index.html</code> and <code>iNdex.html</code> are NOT
+            the same files. In order for your site to work properly, you must make sure that both the filenames and the
+            HTML that refers to the filename use the same casing. Since many operating systems by default hide or pretty
+            the actual cases of their filenames, I recommend either turning off those features (if you know how) or use an
+            SFTP client that shows you how the files actually look when uploaded. </p>
+          <p>[ Info in this section comes from <a href="https://support.dma.ucla.edu/help/?q=FrequentlyAskedQuestions"
+              target="_blank">DMA Support</a> ] </p>
 
           <h2>Suggested File Structure</h2>
           <p>It is helpful to put each weekly or project part into it's own file on your local machine and on cyberduck.
@@ -138,26 +148,4 @@ <h2>Suggested File Structure</h2>
       </div>
    </section>
   </body>
-=======
-        <p>PLEASE NOTE: if you do not have an <em>index.html</em> file and type the URL without a filename at the end,
-          you will get an error message (access forbidden). This is for your own protection, as it prevents people from
-          browsing through your directory when you are not ready for them to do so. </p>
-        <p>NOTE 1: Permissions File permissions matter. All files in the <em>public_html</em> directory should be
-          world-readable in order to ensure their availability online. Similarly, all directories should be world
-          readable and executable. Most clients will deposit the files in the correct manner, but there have been some
-          reports that moving whole folders from other parts of your home directory to your web area may mess up
-          permissions depending on your client. </p>
-        <p>NOTE 2: CAPITALIZATION MATTERS! That is to say, <code>index.html</code> and <code>iNdex.html</code> are NOT
-          the same files. In order for your site to work properly, you must make sure that both the filenames and the
-          HTML that refers to the filename use the same casing. Since many operating systems by default hide or pretty
-          the actual cases of their filenames, I recommend either turning off those features (if you know how) or use an
-          SFTP client that shows you how the files actually look when uploaded. </p>
-        <p>[ Info in this section comes from <a href="https://support.dma.ucla.edu/help/?q=FrequentlyAskedQuestions"
-            target="_blank">DMA Support</a> ] </p>
-      </main>
-    </div>
-  </section>
-</body>
-
->>>>>>> 6834b6abf56ff0ae07a16928365c4ba851651041
 </html>