apache / www-site

The ASF Website
Apache License 2.0
46 stars 108 forks source link

Merge content from http://svn.apache.org/repos/asf/board/site #302

Closed sebbASF closed 1 year ago

sebbASF commented 1 year ago

Note: please do NOT squash before merge. It's much easier to follow the changes to index.md as separate commits

This change has been discussed on the board list:

https://lists.apache.org/thread/cmobom45sqj9ndbx4b54m3wnw0fyvpz7 (requires login)

Summary of changes to www-site:

Rename index.md to policies.md

Reconstruct index.md from http://svn.apache.org/repos/asf/board/site/theme/templates/index.html

Drop slugs; they don't work with this flavour of Pelican Did not rename ASF-5-year-plan-02-21-2018.md as plan.md as no need.

Detailed explanation of changes:

The following is for historical information.

At time of writing, the files displayed at https://apache.org/board are derived from two places:

https://github.com/apache/www-site/tree/asf-site/output/board which is built from https://github.com/apache/www-site/tree/main/content/board

and

http://svn.apache.org/repos/asf/board/site/output/ which in turn is built from https://svn.apache.org/repos/asf/board/site/

This contains the following page sources

content/pages/ASF-5-year-plan-02-21-2018.md slug: plan content/pages/escalation.md slug: escalation content/pages/index.md slug: policies content/pages/services.md slug: services

The slug controls the output name in that version of Pelican, failing that the page Title. [The index.md file generated various output files, but did not generate index.html]

The index page was generated from: theme/templates/index.html

The output was generated under:

http://svn.apache.org/repos/asf/board/site/output

This contains:

apache-board-information.html apache-board-project-services-expectations.html archives.html authors.html board-policy.html categories.html escalation.html index.html plan.html policies.html services.html tags.html

However, several of those pages are stale, because previously generated pages were not removed when the source was renamed or removed.

Thus only the files which were updated most recently are really intended to be present. These files are:

escalation.html index.html plan.html policies.html services.html

This can be shown by the following command:

$ svn info -R http://svn.apache.org/repos/asf/board/site | grep '^Relative URL:\| Date:' | fgrep -B 1 ' 202'
Relative URL: ^/board/site
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
--
Relative URL: ^/board/site/output
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
--
Relative URL: ^/board/site/output/escalation.html
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
Relative URL: ^/board/site/output/index.html
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
Relative URL: ^/board/site/output/plan.html
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
Relative URL: ^/board/site/output/policies.html
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
Relative URL: ^/board/site/output/services.html
Last Changed Date: 2020-04-16 15:18:56 +0100 (Thu, 16 Apr 2020)
--
Relative URL: ^/board/site/theme
Last Changed Date: 2020-04-16 15:18:45 +0100 (Thu, 16 Apr 2020)
--
Relative URL: ^/board/site/theme/templates
Last Changed Date: 2020-04-16 15:18:45 +0100 (Thu, 16 Apr 2020)
--
Relative URL: ^/board/site/theme/templates/index.html
Last Changed Date: 2020-04-16 15:18:45 +0100 (Thu, 16 Apr 2020)

Explanation of stale files:

apache-board-information.html This was built from index.md when its Title was: "Apache Board -- Information"

apache-board-project-services-expectations.html This was built from index.md when its Title was: "Apache Board -- Project Services & Expectations"

archives.html - old Pelican file authors.html - old Pelican file

board-policy.html This was built from index.md when its Slug was board-policy

categories.html - old Pelican file tags.html - old Pelican file

Paul-TT commented 1 year ago

@sebbASF Are these changes viewable on a staging environment? Apologies in advance if I am not understanding correctly, but won't changing index.md to policies.md break the link to https://www.apache.org/board/ ?

sebbASF commented 1 year ago

There is an earlier version available at https://www-board-merge.staged.apache.org

In this version, I did not rename ASF-5-year-plan-02-21-2018.md, but they are otherwise similar.

Note that the renamed index.md is replaced, so https://www.apache.org/board/ will still work.

Paul-TT commented 1 year ago

I see. @sebbASF Thanks for the explanation. Looks good to me.