Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

language cleanups #359

Merged
merged 2 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/badwords.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4

- name: check
run: ./.github/scripts/badwords.pl -w ./.github/scripts/badwords.ok < .github/scripts/badwords.txt docs/*.md
run: ./.github/scripts/badwords.pl -w ./.github/scripts/badwords.ok < .github/scripts/badwords.txt docs/*.md '*html'
2 changes: 1 addition & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Header set Content-Security-Policy: "default-src 'self' curl.haxx.se www.curl.se
# Google Custom Search requires unsafe-eval & unsafe-inline in the CSP which
# knocks a giant hole in the protection a CSP provides. Therefore, only use
# that on the pages where custom search is used to mitigate it somewhat. The
# search page that shows up on the 404 error page won't be matched by this,
# search page that shows up on the 404 error page will not be matched by this,
# however. The following link is supposed to be updated when Google fixes this
# CSP issue and this hack can be removed:
# https://support.google.com/programmable-search/thread/60663049?hl=en
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# curl-www

This is (most of) the curl.se web site contents. It mostly builds static
This is (most of) the curl.se website contents. It mostly builds static
HTML files that are preprocessed.

## Prerequisites

The web site is a on old custom made setup that mostly builds static HTML
The website is a on old custom made setup that mostly builds static HTML
files from a set of source files using (GNU) `make`. The sources files are
preprocessed with what is basically a souped-up C preprocessor called `fcpp`
and a set of `perl` scripts. The manpages get converted to HTML with
Expand All @@ -27,11 +27,11 @@ Make sure the following tools are in your $PATH.

## Build

Once you've cloned the Git repo the first time, invoke `sh bootstrap.sh` once
Once you have cloned the Git repo the first time, invoke `sh bootstrap.sh` once
to get a symlink and some some initial local files setup, and then you can
build the web site locally by invoking make in the source root tree.
build the website locally by invoking make in the source root tree.

Note that this doesn't make you a complete web site mirror, as some scripts
Note that this does not make you a complete website mirror, as some scripts
and files are only available on the real actual site, but should give you
enough to let you load most HTML pages locally.

Expand Down
4 changes: 2 additions & 2 deletions _404.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<p><b>This resource is gone!</b>
<p>
Whatever you hoped you were going to get when you asked for this particular
URL, it isn't here. We may have removed some old cruft and hope that you
URL, it is not here. We may have removed some old cruft and hope that you
will find your way to the new content instead, you may have pasted a bad URL
or we may have screwed up somewhere when we edited content on the site.
We just can't tell.
We just cannot tell.

<p>
A humble suggestion is that you start over on
Expand Down
22 changes: 11 additions & 11 deletions _about.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "_doctype.html"
<html>
<head> <title>curl - About curl Web Site</title>
<head> <title>curl - About curl website</title>
#include "css.t"
</head>

Expand All @@ -13,18 +13,18 @@
#include "docs/_menu.html"

WHERE3(Docs, "/docs/", Project, "/docs/projdocs.html", About)
TITLE(About the curl Web Site)
TITLE(About the curl website)
<div class="relatedbox">
<b>Related:</b>
<br><a href="/docs/">Online Docs</a>
<br><a href="/mirror/">Mirrors</a>
</div>
<p>
This web site is dedicated to covering curl, libcurl and related issues only.
This website is dedicated to covering curl, libcurl and related issues only.

<p>
If you have any complaints, ideas or suggestions for this <b>web site</b>,
don't hesitate to mail feedback to <a
If you have any complaints, ideas or suggestions for this <b>website</b>,
do not hesitate to mail feedback to <a
href="mailto:[email protected]">[email protected]</a> or post it on the <a
href="//curl.se/mail/">curl-users mailing list</a>. We do make a
serious effort to please our audience.
Expand All @@ -33,7 +33,7 @@
proper <a href="/mail/">curl mailing list</a>.
<p>

SUBTITLE(The curl web site contents are...)
SUBTITLE(The curl website contents are...)
<ul>

<li> maintained and edited by the team. If you want to join in and help out
Expand All @@ -49,9 +49,9 @@

SUBTITLE(Zero tracking)
<ul>
<li> We serve no ads on any curl related web site.
<li> We run no analytics scripts on any curl related web sites
<li> We don't log web site visitors.
<li> We serve no ads on any curl related website.
<li> We run no analytics scripts on any curl related websites
<li> We do not log website visitors.
</ul>

SUBTITLE(Technologies used to build the site)
Expand All @@ -77,8 +77,8 @@
SUBTITLE(Emails and Spam)
<p>
We regularly display email addresses on this site by replacing the '@' sign with a
textual version. Research has shown that when we publish addresses in
plaintext, we get a whole lot more spam. Sorry for the inconvenience.
textual version. Research has shown that when we publish addresses in
plaintext, we get a whole lot more spam. Sorry for the inconvenience.

#include "_footer.html"
</body>
Expand Down
2 changes: 1 addition & 1 deletion _book.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<p>
Learn how to use curl. How to use libcurl. How to build them from source or
perhaps how the curl project accepts contributions. There's something for
perhaps how the curl project accepts contributions. There is something for
everyone in this, from the casual first-time users to the experienced
libcurl hackers.
<p>
Expand Down
Loading
Loading