FSFE
/
fsfe-website
29
30
Fork 85
Code Issues 62 Pull Requests 14 Wiki Activity

New Podcast episode, plus updated picture on buehl article to proper format #1480

Merged
max.mehl merged 6 commits from Podcast_ep_6 into master 2020-07-03 12:20:34 +00:00
Conversation 0 Commits 6 Files Changed 3 +72 -2
bonnie commented 2020-07-03 11:27:53 +00:00
Member
Copy Link

Hello All,

This is the PR for the new Software Freedom Podcast.

I hope I thought about everything.

Best
Bonnie

Hello All, This is the PR for the new Software Freedom Podcast. I hope I thought about everything. Best Bonnie
max.mehl requested changes 2020-07-03 11:31:55 +00:00
news/podcast/episode-6.en.xhtml Outdated
@ -0,0 +10,4 @@
<h1>SFP#6 Copyright enforcement with Dr. Miriam Ballhausen</h1>
<p newsteaser="yes">In our Software Freedom Podcast we talk with people who have inspiring [didn't we want to change that "inspiring ideas"] ideas about software freedom. For this sixth episode, we talk with Dr. Miriam Ballhausen, who is a German lawyer with the focus on software, data protection, copyright law and who specialised in Free Software copyright questions.</p>
max.mehl commented 2020-07-03 11:28:51 +00:00
Owner
Copy Link

there is a note inside. i also suggest to change this "inspiring ideas" blurb, it's a bit boring ;)

there is a note inside. i also suggest to change this "inspiring ideas" blurb, it's a bit boring ;)
news/podcast/episode-6.en.xhtml Outdated
@ -0,0 +18,4 @@
<p>In this sixth episode of the <a href="/news/podcast.html">Software Freedom Podcast</a> we talk about Free Software copyright enforcement with our guest <a href="https://www.twobirds.com/de/our-lawyers/d/dr-miriam-ballhausen">Dr. Miriam Ballhausen</a>. Dr. Miriam Ballhausen is a German laywer and is specialised in Free Software copyright questions. Together we cover the basics about Free Software licensing and discuss, how Free Software copyright can be enforced, what are the steps to enforce it and why it is often enforced in Germany. We also explore what could help to not be on the receiving [Not yet sure about this phrasing. It is understandable for newbies, but is it too "easy"?] end of a 'cease and desist letter' and how the <a href= "https://reuse.software">REUSE project</a> could help with being in compliance with Free Software licenses.</p>
max.mehl commented 2020-07-03 11:29:36 +00:00
Owner
Copy Link
  • also a note here
  • space in href= "
* also a note here * space in `href= "`
news/podcast/episode-6.en.xhtml Outdated
@ -0,0 +32,4 @@
<li><a href="https://reuse.software/">REUSE</a></li>
<li><a href="https://git.fsfe.org/reuse/">REUSE Git
repositories</a></li>
<li><a href="https://github.com/fsfe/reuse-tool">REUSE-tool</a></li>
max.mehl commented 2020-07-03 11:30:34 +00:00
Owner
Copy Link

REUSE helper tool

REUSE helper tool
bonnie commented 2020-07-03 11:39:39 +00:00
Author
Member
Copy Link

done :)

done :)
max.mehl commented 2020-07-03 11:44:41 +00:00
Owner
Copy Link

Sorry, no, you changed the text of the normal REUSE website :(

Sorry, no, you changed the text of the normal REUSE website :(
bonnie commented 2020-07-03 11:46:16 +00:00
Author
Member
Copy Link

oh, I thought that was what you meant but I will rechange it and change the last link to github.com, okay?

oh, I thought that was what you meant but I will rechange it and change the last link to github.com, okay?
news/podcast/episode-6.en.xhtml Outdated
@ -0,0 +48,4 @@
<tags>
<tag key="front-page"/>
<tag key="podcast">Software Freedom Podcast</tag>
<tag key="copyright"/>
max.mehl commented 2020-07-03 11:31:11 +00:00
Owner
Copy Link

<tag key="copyright">Copyright</tag>

`<tag key="copyright">Copyright</tag>`
news/podcast/episode-6.en.xhtml
@ -0,0 +79,4 @@
<image url="https://pics.fsfe.org/uploads/big/0418b6e4006c22d87b08165ce16d6621.png" />
</html>
<!--
max.mehl commented 2020-07-03 11:31:47 +00:00
Owner
Copy Link

you can remove everything from here downwards (so from <!--)

you can remove everything from here downwards (so from `<!--`)
bonnie commented 2020-07-03 11:52:19 +00:00
Author
Member
Copy Link

done, and you meant from <!-- this on, or?

done, and you meant from <!-- this on, or?
max.mehl requested changes 2020-07-03 11:52:18 +00:00
news/podcast/episode-6.en.xhtml
@ -0,0 +10,4 @@
<h1>SFP#6 Copyright enforcement with Dr. Miriam Ballhausen</h1>
<p newsteaser="yes">In our Software Freedom Podcast we talk with people and we discuss a new Free-Software-related topic with experts from our community. For this sixth episode, we talk with Dr. Miriam Ballhausen, who is a German lawyer with the focus on software, data protection, copyright law and who specialised in Free Software copyright questions.</p>
max.mehl commented 2020-07-03 11:52:01 +00:00
Owner
Copy Link

Text suggestion for this para:

We invited Dr. Miriam Ballhausen to talk with us about copyright enforcement. She is a German lawyer with the focus on software, data protection, copyright law and specifically Free Software copyright. This is the sixth regular episode of the Software Freedom Podcast for which we invite experts from our community.

Text suggestion for this para: We invited Dr. Miriam Ballhausen to talk with us about copyright enforcement. She is a German lawyer with the focus on software, data protection, copyright law and specifically Free Software copyright. This is the sixth regular episode of the Software Freedom Podcast for which we invite experts from our community.
bonnie commented 2020-07-03 11:53:18 +00:00
Author
Member
Copy Link

I can include this but, should I just resent the file to the PR?

I can include this but, should I just resent the file to the PR?
max.mehl commented 2020-07-03 11:54:01 +00:00
Owner
Copy Link

Not necessary, I can approve that here

Not necessary, I can approve that here
bonnie commented 2020-07-03 12:00:47 +00:00
Author
Member
Copy Link

done

done
max.mehl requested changes 2020-07-03 12:11:48 +00:00
news/podcast/episode-6.en.xhtml
@ -0,0 +25,4 @@
<li><a href="https://git.fsfe.org/reuse/">REUSE Git
repositories</a></li>
<li><a href="https://github.com/fsfe/reuse-tool">REUSE helper tool</a></li>
<li><a href=" https://fsfe.org/activities/ln/">The Legal Network</a></li>
max.mehl commented 2020-07-03 12:11:33 +00:00
Owner
Copy Link

ah, another link space here

ah, another link space here
bonnie commented 2020-07-03 12:14:20 +00:00
Author
Member
Copy Link

done :)

and also searched for spaces and didn't find anymore such ones.

done :) and also searched for spaces and didn't find anymore such ones.
max.mehl closed this pull request 2020-07-03 12:20:34 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
bug

   
build

   
cgi Scripting

   
design

   
disruptive

Requires careful coordination and documentation changes

  
documentation

   
duplicate

   
easy

   
feature-request

   
help wanted

   
javascript

   
priority/low

   
question

   
system-hackers

   
tagging

   
text

   
translations

   
wait/bugfix

   
wait/inprogress

   
wait/misc

   
wait/proofread

   
wontfix

   
xsl
No Label
bug
build
cgi Scripting
design
disruptive
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#1480
No description provided.
Delete Branch "Podcast_ep_6"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?