Merge pull request #411 from bbannon/typos

various corrections
craigk5n · Sep 13, 2023 · 4da50d1 · 4da50d1
2 parents b201f3b + 48fcc20
commit 4da50d1
Show file tree

Hide file tree

Showing 111 changed files with 349 additions and 323 deletions.
diff --git a/GPL.html b/GPL.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>GNU General Public License - GNU Project - Free Software Foundation (FSF)</title>
-<link rev="made" href="mailto:webmasters@www.gnu.org">
-<base href="http://www.gnu.org/licenses/gpl.html">
+<link rev="made" href="mailto:[email protected]">
+<base href="https://gnu.org/licenses/old-licenses/gpl-2.0.html">
 </head>
 <body bgcolor="#FFFFFF" text="#000000" link="#1F00FF" alink="#FF0000" vlink="#9900DD">
 <h1>GNU General Public License</h1>
@@ -528,7 +528,7 @@ <h2><a name="SEC4" href="gpl.html#TOC4">How to Apply These Terms to Your New Pro
 Other <a href="/home.html#ContactInfo">ways to contact</a> the FSF.
 <p>
 Comments on these web pages to
-<a href="mailto:webmasters@www.gnu.org"><em>webmasters@www.gnu.org</em></a>,
+<a href="mailto:[email protected]"><em>[email protected]</em></a>,
 send other questions to
 <a href="mailto:[email protected]"><em>[email protected]</em></a>.
 <p>

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 WebCalendar README
 ------------------
 
-Project Home Page: https://www.k5n.us/webcalendar/  
-Project Owner: Craig Knudsen, &#99;&#114;&#97;&#105;&#103;&#64;&#107;&#53;&#110;&#46;&#117;&#115;  
+Project Home Page: https://k5n.us/webcalendar/
+Project Owner: Craig Knudsen, &#99;&#114;&#97;&#105;&#103;&#64;&#107;&#53;&#110;&#46;&#117;&#115;
 Documentation:
 - [System Administrator's Guide](http://htmlpreview.github.io/?https://github.com/craigk5n/webcalendar/blob/master/docs/WebCalendar-SysAdmin.html) (Installation instructions, FAQ)
 - [Upgrading Instructions](http://htmlpreview.github.io/?https://github.com/craigk5n/webcalendar/blob/master/UPGRADING.html)
@@ -52,7 +52,7 @@ and MariaDb running that is setup with the `docker-compose` command.
   build the containers in step above).
 - Run the following db commands:
   ```
-  GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION; 
+  GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
   FLUSH PRIVILEGES;
   QUIT
   ```
@@ -84,7 +84,7 @@ files in the container.
   build the containers in step above).
 - Run the following db commands:
   ```
-  GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION; 
+  GRANT ALL PRIVILEGES ON *.* TO webcalendar_php8@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
   FLUSH PRIVILEGES;
   QUIT
   ```
@@ -111,7 +111,7 @@ steps.
   build the containers in step above).
 - Run the following db commands:
   ```
-  GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION; 
+  GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
   FLUSH PRIVILEGES;
   QUIT
   ```

diff --git a/access.php b/access.php
@@ -6,7 +6,7 @@
  * - list users to manage (no parameters)
  * - manage a single user's rights (just "user" parameter)
  *   this will include which functions the user can access and
- *   (if $ALLOW_VIEW_OTHER is 'Y') which calendars thay can view/edit/approve
+ *   (if $ALLOW_VIEW_OTHER is 'Y') which calendars they can view/edit/approve
  * - update the database (form handler)
  *
  * Input Parameters:

diff --git a/category.php b/category.php
@@ -156,7 +156,7 @@
 }
 ?>
 
-<!-- Icon selectoin modal -->
+<!-- Icon selection modal -->
 <div class="modal fade" id="iconmodal" role="dialog">
     <div class="modal-dialog">
         <!-- Modal content-->

diff --git a/category_handler.php b/category_handler.php
@@ -47,7 +47,7 @@ function renameIcon($id)
 if (!empty($_FILES['FileName']))
   $file = $_FILES['FileName'];
 
-// Make sure we clear $file if no file was upoaded.
+// Make sure we clear $file if no file was uploaded.
 if (!empty($file['tmp_name']) && $file['tmp_name'] == 'none')
   $file = '';
 

diff --git a/day.php b/day.php
@@ -37,7 +37,7 @@
 
 $printerStr = $unapprovedStr = '';
 
-/* Pre-Load the repeated events for quckier access */
+/* Pre-Load the repeated events for quicker access */
 $repeated_events = read_repeated_events ( empty ( $user )
   ? $login : $user, $startdate, $enddate, $cat_id );
 

diff --git a/docker/docker-compose-php7.yml b/docker/docker-compose-php7.yml
@@ -8,7 +8,7 @@
 #     /bin/mariadb -p
 #     (enter the MYSQL_ROOT_PASSWORD below)
 #   Execute the following three db commands:
-#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION;
+#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
 #     FLUSH PRIVILEGES;
 #     QUIT
 

diff --git a/docker/docker-compose-php8-dev.yml b/docker/docker-compose-php8-dev.yml
@@ -8,7 +8,7 @@
 #     /bin/mariadb -p
 #     (enter the MYSQL_ROOT_PASSWORD below)
 #   Execute the following three db commands:
-#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION;
+#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
 #     FLUSH PRIVILEGES;
 #     QUIT
 #

diff --git a/docker/docker-compose-php8.yml b/docker/docker-compose-php8.yml
@@ -8,7 +8,7 @@
 #     /bin/mariadb -p
 #     (enter the MYSQL_ROOT_PASSWORD below)
 #   Execute the following three db commands:
-#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1'  WITH GRANT OPTION;
+#     GRANT ALL PRIVILEGES ON *.* TO webcalendar@localhost IDENTIFIED BY 'Webcalendar.1' WITH GRANT OPTION;
 #     FLUSH PRIVILEGES;
 #     QUIT
 #

diff --git a/docs/README b/docs/README
@@ -26,7 +26,7 @@ faqs.html
   typing "make" should generate this file.  This file is not a complete
   HTML file.  It is intended to be inserted into the body of another
   HTML page.  You can see it in use at:
-    http://www.k5n.us/webcalendar.php?topic=FAQ
+    http://k5n.us/webcalendar.php?topic=FAQ
 
 
 Tools
@@ -49,5 +49,3 @@ extractfaqs.pl
 Makefile
   Used by the 'make' command to create files that are generated from
   other files.
-
-
diff --git a/docs/WebCalendar-DeveloperGuide.html b/docs/WebCalendar-DeveloperGuide.html
@@ -25,8 +25,8 @@ <h2>Table of Contents</h2>
 <a name="intro"></a>
 <h2>Introduction</h2>
 
-<p>WebCalendar is written in PHP. A minimum of PHP 4.0.1 is
-required to run WebCalendar due to the use of classes and sessions.
+<p>WebCalendar is written in PHP. A minimum of PHP 7.4 is
+required to run WebCalendar.
 </p>
 
 <div class="top"><a href="#" target="_top">top</a></div>
@@ -38,27 +38,30 @@ <h2>Tools</h2>
 </p>
 
 <dl>
-  <dt><a href="http://www.perl.org">perl</a></dt>
+  <dt><a href="http://perl.org">perl</a></dt>
   <dd>Perl is used to check translation files to see what translations are
   missing. If you are using Windows, perl is included as part of the <a
-    href="http://www.cygwin.com">Cygwin</a> package.</dd>
+    href="http://cygwin.com">Cygwin</a> package.</dd>
 
   <dt>make</dt>
   <dd>The "make" command is used when generating WebCalendar documentation in
   the <tt>docs</tt> directory. The "make" command is standard on Linux if you
   install certain development packages. If you are using Windows, make is
-  included as part of the <a href="http://www.cygwin.com">Cygwin</a> package.</dd>
+  included as part of the <a href="http://cygwin.com">Cygwin</a> package.</dd>
 
-  <dt><a href="http://www.gnu.org/software/patch/patch.html">patch</a></dt>
+  <dt><a href="http://gnu.org/software/patch/patch.html">patch</a></dt>
   <dd>The "patch" command is used to apply patches posted on the SourceForge
   patches area.</dd>
 
   <dt>diff</dt>
   <dd>The "diff" command is used to create patches posted on the SourceForge
   patches area.</dd>
 
-  <dt><a href="https://www.cvshome.org/">CVS</a></dt>
+      <!--
+      [bad link]
+  <dt><a href="https://cvshome.org/">CVS</a></dt>
   <dd>Configuration management is accomplished using CVS.</dd>
+ -->
 
   <dt>Internet Explorer, Mozilla/Firefox, and Apple Safari</dt>
   <dd>We try to test on all three of these platforms whenever we make any HTML
@@ -67,7 +70,7 @@ <h2>Tools</h2>
 </dl>
 
 <p><span class="tip">TIP</span> If you are developing on a
-Windows system, the <a href="http://www.cygwin.com">Cygwin package</a>
+Windows system, the <a href="http://cygwin.com">Cygwin package</a>
 will provide command line tools that
 include perl, make, patch, diff and cvs.
 </p>
@@ -80,7 +83,7 @@ <h2>Getting The Code</h2>
 
 <p>You should always be using the latest code from git:</p>
 
-<a href="https://github.com/craigk5n/webcalendar">https://github.com/craigk5n/webcalendar</a>
+    <a href="https://github.com/craigk5n/webcalendar">WebCalendar</a>
 
 <p>To obtain the code from your command line using the git command:</p>
 
@@ -180,19 +183,26 @@ <h2>Coding Standards</h2>
 
   <dt>PHP file comments</dt>
   <dd>Each file should have a file header.
+
+        <!--
+    [bad link]
     <br>
     See <a
       href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/report.php?revision=1.56&amp;view=markup"><tt>report.php</tt></a>
     as an example.</dd>
+ -->
 
   <dt>PHP function comments</dt>
-  <dd>Function documentation is generated using <a href="http://www.phpdoc.org/"
+  <dd>Function documentation is generated using <a href="http://phpdoc.org/"
     title="phpDocumentor">phpDocumentor</a>. Each function should be preceded
-  by a DocBlock. See the phpDocumentor website for <a
+  by a DocBlock. See the phpDocumentor website for information about <a
     href="http://manual.phpdoc.org/HTMLSmartyConverter/HandS/phpDocumentor/tutorial_phpDocumentor.howto.pkg.html#basics.docblock"
-    title="DocBlocks">information about DocBlocks and DocBlock syntax</a>, and
+    >DocBlocks</a> and DocBlock syntax.
+        <!--
+        [bad link]
+    , and
   see <a href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/includes/functions.php?revision=1.389&amp;view=markup"><tt>includes/functions.php</tt></a> for examples.</dd>
-
+ -->
   <dt>XHTML</dt>
   <dd>All XHTML should conform to XHTML 1.0 Transitional. Use double quotes around HTML attributes.</dd>
 
@@ -336,10 +346,10 @@ <h2>Frequently Asked Questions</h2>
   <br><br>
   Others are patch files, which usually have a <tt>.diff</tt> or
   <tt>.patch</tt> file extension. In order to use one of these files, you need
-  the <a href="http://www.gnu.org/software/patch/patch.html">GNU patch</a>
+  the <a href="http://gnu.org/software/patch/patch.html">GNU patch</a>
   program. (This should be installed on all Linux systems and you can get a
   version for Windows. I use the patch program that comes with <a
-    href="http://www.cygwin.com">Cygwin</a> on windows.) I would recommend
+    href="http://cygwin.com">Cygwin</a> on windows.) I would recommend
   testing the patch on your install first using the <tt>--dry-run</tt> option.
   <br><br>
   For example, if the patch file is called <tt>calmods.diff</tt>, then you
@@ -365,6 +375,8 @@ <h2>Resources</h2>
 <p>The following resources may be helpful:</p>
 
 <ul>
+      <!--
+      [bad links]
   <li>The <a href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/TODO?revision=1.13&amp;view=markup">TODO</a>
   file in CVS contains ideas for future enhancements.</li>
   <li>The <a href="http://sourceforge.net/forum/forum.php?forum_id=11587">Open
@@ -374,6 +386,7 @@ <h2>Resources</h2>
   SourceForge.</li>
   <li><a href="http://sourceforge.net/tracker/?group_id=3870&amp;atid=303870">Patches</a> on
   SourceForge.</li>
+ -->
   <li><a href="WebCalendar-Functions.html">WebCalendar Function Documentation</a></li>
   <li><a
     href="WebCalendar-Database.html">WebCalendar-Database.html</a>

diff --git a/docs/WebCalendar-Styling.html b/docs/WebCalendar-Styling.html
@@ -22,12 +22,12 @@ <h2><a id="intro" href="#toc">Introduction</a></h2>
 
   <p>WebCalendar offers an easy-to-use method for customizing colors via the Admin Panel. This document provides a more technical, in depth analysis of WebCalendar's styling system. Please note: The WebCalendar styling system is still under construction. We plan on continuing to enhance functionality, and available options in the future.</p>
 
-  <p>WebCalendar uses <a title="W3C CSS homepage" href="http://www.w3.org/Style/CSS">CSS</a> to format its content. For an introduction to CSS, you may wish to read
-  <a title="Starting with HTML + CSS" href="http://www.w3.org/Style/Examples/011/firstcss">Starting with HTML + CSS</a>, and/or
-  <a title="Dave Raggett's Introduction to CSS" href="http://www.w3.org/MarkUp/Guide/Style">Dave Raggett's Introduction to CSS</a>. The technical specifications are available at the <abbr title="World Wide Web Consortium">W3C</abbr>:</p>
+  <p>WebCalendar uses <a title="W3C CSS homepage" href="http://w3.org/Style/CSS">CSS</a> to format its content. For an introduction to CSS, you may wish to read
+  <a href="http://w3.org/Style/Examples/011/firstcss">Starting with HTML + CSS</a>, and/or
+  <a href="http://w3.org/MarkUp/Guide/Style">Dave Raggett's Introduction to CSS</a>. The technical specifications are available at the <abbr title="World Wide Web Consortium">W3C</abbr>:</p>
   <ul><li>
-    <a href="http://www.w3.org/TR/CSS1" title="Cascading Style Sheets, Level 1">CSS 1</a></li><li>
-    <a href="http://www.w3.org/TR/CSS21" title="Cascading Style Sheets, Level 2 Revision 1">CSS 2.1</a>
+    <a href="http://w3.org/TR/CSS1" title="Cascading Style Sheets, Level 1">CSS 1</a></li><li>
+    <a href="http://w3.org/TR/CSS21" title="Cascading Style Sheets, Level 2 Revision 1">CSS 2.1</a>
   </li></ul>
 
   <h2><a id="classes" href="#toc">Classes</a></h2>