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

docs: HTML header charset changed from ISO-8859-1 to UTF-8 #2547

Merged
merged 4 commits into from
Aug 29, 2022

Conversation

landam
Copy link
Member

@landam landam commented Aug 27, 2022

  • mkhtml.py simplified (py2-specific code removed)

@landam landam added manual Documentation related issues HTML Related code is in HTML labels Aug 27, 2022
@landam landam added this to the 8.4.0 milestone Aug 27, 2022
@landam landam requested a review from wenzeslaus August 27, 2022 14:15
@landam landam changed the title HTML header charset changed from ISO-8859-2 to UTF-8 HTML header charset changed from ISO-8859-1 to UTF-8 Aug 27, 2022
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

I think the files are already in UTF-8, so this should work.

@wenzeslaus
Copy link
Member

I resolved the conflict by combining the two lines in the GitHub web interface.

@landam landam merged commit 17fc1d8 into OSGeo:main Aug 29, 2022
@landam landam deleted the html_utf8 branch August 29, 2022 07:43
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Oct 26, 2022
* html header charset change from iso-8859-1 to utf-8
* mkhtml: remove py2 code

Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>
ninsbl pushed a commit to ninsbl/grass that referenced this pull request Feb 17, 2023
* html header charset change from iso-8859-1 to utf-8
* mkhtml: remove py2 code

Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>
neteler added a commit to neteler/grass that referenced this pull request Feb 21, 2023
…_8_2)

Currently Travis CI fails in `releasebranch_8_2`:

```
Traceback (most recent call last):

  File "/home/travis/build/OSGeo/grass/dist.x86_64-pc-linux-gnu/utils/mkhtml.py", line 37, in <module>
    from six.moves.urllib import request as urlrequest

ModuleNotFoundError: No module named 'six'
```

(Example for a failed Travis run: https://github.com/OSGeo/grass/pull/2843/checks?check_run_id=11475577650)

This PR addresses the removal of `six` in a simple way.

Side note: Travis does not fail in `main` due to PR OSGeo#2547,
OSGeo@17fc1d8#diff-3e1684c5c5d40b273b6488a9b5a5558f556d2bcf2973ba5106b6125e01aa6959
neteler added a commit that referenced this pull request Feb 21, 2023
…_8_2) (#2845)

Currently Travis CI fails in `releasebranch_8_2`:

```
Traceback (most recent call last):

  File "/home/travis/build/OSGeo/grass/dist.x86_64-pc-linux-gnu/utils/mkhtml.py", line 37, in <module>
    from six.moves.urllib import request as urlrequest

ModuleNotFoundError: No module named 'six'
```

(Example for a failed Travis run: https://github.com/OSGeo/grass/pull/2843/checks?check_run_id=11475577650)

This PR addresses the removal of `six` in a simple way.

Side note: Travis does not fail in `main` due to PR #2547,
17fc1d8#diff-3e1684c5c5d40b273b6488a9b5a5558f556d2bcf2973ba5106b6125e01aa6959
neteler pushed a commit that referenced this pull request Jun 3, 2023
Backport of #2547

* html header charset change from iso-8859-1 to utf-8

Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>
@wenzeslaus wenzeslaus changed the title HTML header charset changed from ISO-8859-1 to UTF-8 docs: HTML header charset changed from ISO-8859-1 to UTF-8 Jun 6, 2023
neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023
* html header charset change from iso-8859-1 to utf-8
* mkhtml: remove py2 code

Co-authored-by: Vaclav Petras <wenzeslaus@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
HTML Related code is in HTML manual Documentation related issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants