Skip to content

Fix stale comment in site.conf.dist referencing removed database.conf#3056

Open
xcompass wants to merge 1 commit into
openwebwork:WeBWorK-2.21from
ubc:upstream-siteconf-stale-databaseconf-comment
Open

Fix stale comment in site.conf.dist referencing removed database.conf#3056
xcompass wants to merge 1 commit into
openwebwork:WeBWorK-2.21from
ubc:upstream-siteconf-stale-databaseconf-comment

Conversation

@xcompass

@xcompass xcompass commented Jul 13, 2026

Copy link
Copy Markdown
Member

Summary

Comment-only fix in conf/site.conf.dist: the header above the
$database_* variables still says they "are used by database.conf", but
conf/database.conf no longer ships. Replace it with a simple statement
of what the variables are for — "These variables define the database
connection." — so admins reading site.conf.dist aren't sent looking for
a file that no longer exists.

No behavior is affected.

Testing

  • Verified conf/database.conf/.dist is absent on current WeBWorK-2.21 (and develop).
  • Diff is comment lines only; no Perl code touched.

Comment thread conf/site.conf.dist Outdated
Comment on lines +134 to +135
# these variables define the database connection (they are used by
# lib/WeBWorK/DB.pm and the course management utilities).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change this to

Suggested change
# these variables define the database connection (they are used by
# lib/WeBWorK/DB.pm and the course management utilities).
# These variables define the database connection.

Do not mention where in the code the variables are used. Someone configuring webwork2 does not need (or even want) to know that.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done — applied your suggestion; the comment is now just "These variables define the database connection." with no code references.

@drgrice1

Copy link
Copy Markdown
Member

I have to ask. What does upstream mean in your pull request branches?

The comment above the $database_* variables still says they "are used by
database.conf", but conf/database.conf no longer ships. Replace it with a
simple statement of what the variables are for: "These variables define
the database connection."
@xcompass xcompass force-pushed the upstream-siteconf-stale-databaseconf-comment branch from c3497d0 to 19ece11 Compare July 14, 2026 02:03
@xcompass

Copy link
Copy Markdown
Member Author

Upstream means this repo. We forked and maintain our own fork.

@drgrice1

Copy link
Copy Markdown
Member

I see. It is just a bit of an odd branch prefix to use when submitting to the updated repository. That is why I asked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants