Skip to content

Commit

Permalink
Redo correct typos
Browse files Browse the repository at this point in the history
  • Loading branch information
bbannon committed Aug 8, 2023
1 parent 0df566b commit bc30904
Show file tree
Hide file tree
Showing 80 changed files with 424 additions and 436 deletions.
2 changes: 1 addition & 1 deletion GPL.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<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">
<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>
Expand Down
3 changes: 1 addition & 2 deletions TODO
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ te?
Remove the public calendar and transition users to a public
nonuser calendar as part of the upgrade process.
[ ] Always have "User Access Control" enabled. We might need to work
on help docs or the UI so newbiews can understand this.
on help docs or the UI so newbies can understand this.
[ ] Update upcoming.php to support linking to an event on a nonuser
public calendar. URLs need to go through nulogin.php first and
use return_path to specify the event URL.
Expand Down Expand Up @@ -56,4 +56,3 @@ Here are some other ideas for the next or perhaps later releases:
Details on how to developer ActiveSync Service Providers:
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceactsy/html/ceconunderstandingserviceproviders.asp
http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wceactsy/html/cecondesignguidelinesforactivesyncsynchronizationserviceproviders.asp

2 changes: 1 addition & 1 deletion access.php
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion category.php
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
}
?>

<!-- Icon selectoin modal -->
<!-- Icon selection modal -->
<div class="modal fade" id="iconmodal" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->
Expand Down
2 changes: 1 addition & 1 deletion category_handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '';

Expand Down
2 changes: 1 addition & 1 deletion day.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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 );

Expand Down
46 changes: 23 additions & 23 deletions docs/WebCalendar-DeveloperGuide.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h2>Table of Contents</h2>
</ul>
<hr>

<a name="intro"></a>
<a id="intro"></a>
<h2>Introduction</h2>

<p>WebCalendar is written in PHP. A minimum of PHP 4.0.1 is
Expand All @@ -32,7 +32,7 @@ <h2>Introduction</h2>
<div class="top"><a href="#" target="_top">top</a></div>
<hr>

<a name="Tools"></a>
<a id="Tools"></a>
<h2>Tools</h2>
<p>The following tools will be helpful in WebCalendar development:
</p>
Expand All @@ -45,7 +45,7 @@ <h2>Tools</h2>

<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
the <span class="tt">docs</span> 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>

Expand Down Expand Up @@ -75,7 +75,7 @@ <h2>Tools</h2>
<div class="top"><a href="#" target="_top">top</a></div>
<hr>

<a name="getcode"></a>
<a id="getcode"></a>
<h2>Getting The Code</h2>

<p>You should always be using the latest code from git:</p>
Expand All @@ -87,7 +87,7 @@ <h2>Getting The Code</h2>
<pre>git clone https://github.com/craigk5n/webcalendar.git</pre>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="conventions"></a>
<a id="conventions"></a>
<h2>Naming Conventions</h2>

<p>The following conventions have been adopted by WebCalendar (although they
Expand All @@ -103,7 +103,7 @@ <h2>Naming Conventions</h2>
<li>WebCalendarSettings</li>
</ul>

Classes should be defined in files contained in <tt>includes/classes/</tt>.
Classes should be defined in files contained in <span class="tt">includes/classes/</span>.
Filenames should be of the form ClassName.class. There should only be one
class defined per file.<br>
If incorporating a class from another project (i.e. phpMailer ), it is
Expand Down Expand Up @@ -135,7 +135,7 @@ <h2>Naming Conventions</h2>
</dd>

<dt>Constant Names</dt>
<dd>Constants (declared with <tt>define ()</tt>) should be named with descriptive noun phrases. Names should be in uppercase with WORDS_SEPARATED_BY_UNDERSCORES. Examples:
<dd>Constants (declared with <span class="tt">define()</span>) should be named with descriptive noun phrases. Names should be in uppercase with WORDS_SEPARATED_BY_UNDERSCORES. Examples:
<ul class="example">
<li>ONE_DAY</li>
<li>EXTRA_REMINDER</li>
Expand All @@ -162,7 +162,7 @@ <h2>Naming Conventions</h2>
</dl>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="standards"></a>
<a id="standards"></a>
<h2>Coding Standards</h2>

<p>The following coding standards have been adopted by WebCalendar (although
Expand All @@ -182,7 +182,7 @@ <h2>Coding Standards</h2>
<dd>Each file should have a file header.
<br>
See <a
href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/report.php?revision=1.56&amp;view=markup"><tt>report.php</tt></a>
href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/report.php?revision=1.56&amp;view=markup"><span class="tt">report.php</span></a>
as an example.</dd>

<dt>PHP function comments</dt>
Expand All @@ -191,7 +191,7 @@ <h2>Coding Standards</h2>
by a DocBlock. See the phpDocumentor website for <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
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>
see <a href="http://webcalendar.cvs.sourceforge.net/webcalendar/webcalendar/includes/functions.php?revision=1.389&amp;view=markup"><span class="tt">includes/functions.php</span></a> for examples.</dd>

<dt>XHTML</dt>
<dd>All XHTML should conform to XHTML 1.0 Transitional. Use double quotes around HTML attributes.</dd>
Expand Down Expand Up @@ -255,15 +255,15 @@ <h2>Coding Standards</h2>
</dl>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="patch"></a>
<a id="patch"></a>
<h2>Submitting Changes</h2>

<p>Please use github's pull request feature to contribute
changes to WebCalendar.
</p>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="translations"></a>
<a id="translations"></a>
<h2>Translations and Languages</h2>

<p>When adding or modifying WebCalendar code, all displayed text should be
Expand Down Expand Up @@ -292,10 +292,10 @@ <h2>Translations and Languages</h2>
http://us3.php.net/manual/en/function.htmlentities.php</a></dd>

<dt>Updating Language Files</dt>
<dd>When text is added or updated, requiring new translations, the <tt>
translations/English-US.txt</tt> file
<dd>When text is added or updated, requiring new translations, the <span class="tt">
translations/English-US.txt</span> file
should be updated as a minimum. This file will be used as the basis for updating
the other language files and needs to be up to date. From within the <tt>tools</tt> directory,
the other language files and needs to be up to date. From within the <span class="tt">tools</span> directory,
the following command will search through the WebCalendar source files and
update the language file specified.

Expand All @@ -305,13 +305,13 @@ <h2>Translations and Languages</h2>
</dl>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="faq"></a>
<a id="faq"></a>
<h2>Frequently Asked Questions</h2>
<dl>
<!-- START FAQ: Developing -->
<dt>Why aren't you using PHP sessions?</dt>
<dd>We are still considering using PHP4 sessions. In fact, the
<tt>install/index.php</tt> page <em>does</em> use PHP sessions. The
<span class="tt">install/index.php</span> page <em>does</em> use PHP sessions. The
cookie-based solution that WebCalendar uses is simple, and it will work with
all versions of PHP.</dd>

Expand All @@ -334,22 +334,22 @@ <h2>Frequently Asked Questions</h2>
with the new (assuming the new file and your install are based on the same
version of WebCalendar).
<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
Others are patch files, which usually have a <span class="tt">.diff</span> or
<span class="tt">.patch</span> 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>
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
testing the patch on your install first using the <tt>--dry-run</tt> option.
testing the patch on your install first using the <span class="tt">--dry-run</span> option.
<br><br>
For example, if the patch file is called <tt>calmods.diff</tt>, then you
For example, if the patch file is called <span class="tt">calmods.diff</span>, then you
would use:
<pre>patch --dry-run &lt; calmods.diff</pre>
If the program says it cannot determine which file to patch, try adding -p1:
<pre>patch --dry-run -p1 &lt; calmods.diff</pre>
<br><br>
If it goes through all the changes successfully, do the same command without
the <tt>--dry-run</tt> option to install the patch. If it says "hunk
the <span class="tt">--dry-run</span> option to install the patch. If it says "hunk
failed", then the patch cannot be applied without hand-merging files. This
essentially means that the patch was based on a version of WebCalendar that
is too different than the version that you have installed, so it was unable
Expand All @@ -359,7 +359,7 @@ <h2>Frequently Asked Questions</h2>
</dl>

<div class="top"><a href="#" target="_top">top</a></div>
<a name="resources"></a>
<a id="resources"></a>
<h2>Resources</h2>

<p>The following resources may be helpful:</p>
Expand Down
Loading

0 comments on commit bc30904

Please sign in to comment.