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

Update Router Freedom pages #1074

Merged
max.mehl merged 4 commits from lucas.lasota/fsfe-website:new-router-freedom into master 2019-10-07 09:57:06 +00:00
Conversation 3 Commits 4 Files Changed 2 +65 -65
lucas.lasota commented 2019-09-20 13:44:53 +00:00
Member
Copy Link

Hello,

I am submitting the new version of the Router Freedom page. After the review, if everything is ok, please merge.

Thank you!

Lucas

Hello, I am submitting the new version of the Router Freedom page. After the review, if everything is ok, please merge. Thank you! Lucas
max.mehl requested changes 2019-09-23 13:37:46 +00:00
max.mehl left a comment
Owner
Copy Link

Some suggestions, otherwise good. Thank you!

Some suggestions, otherwise good. Thank you!
activities/routers/routers.en.xhtml Outdated
@ -27,0 +31,4 @@
<p>However, many ISP across Europe do not comply with the regulation yet, imposing their own routers to consumers in a clearly contradiction with the Net Neutrality principle. Their argumentation concerns the location of the network termination point (NTP), an arbitrary definition between the limits of the user’s private and ISP’s network equipment. They introduced a debate to determine whether the NTP would be located inside the end-user domain, so they can use their own modem and router, or the NTP would be part of the domain of the network operator, so end-users cannot use their own router with a private modem. In this case, the users should use the ISP's router.</p>
<div class="image"> <img src="/picturebase/routers/ntp-transp.png" alt="Network Termination Point"/></div>
max.mehl commented 2019-09-23 13:32:57 +00:00
Owner
Copy Link
  1. The path of the image does not seem to be right
  2. Please use the recommended syntax for including images:
<figure>
  <img
      src="https://hroy.eu/images/fsfe_ecm-group_pic/2013-09-ECM-group-picture.JPG"
      alt="group picture!"/>
  <figcaption>
    This is a picture from the Group coordinators meeting<br/>
    Berlin, September 2013
  </figcaption>
</figure>
1. The path of the image does not seem to be right 2. Please use the recommended syntax for including images: ``` <figure> <img src="https://hroy.eu/images/fsfe_ecm-group_pic/2013-09-ECM-group-picture.JPG" alt="group picture!"/> <figcaption> This is a picture from the Group coordinators meeting<br/> Berlin, September 2013 </figcaption> </figure> ```
lucas.lasota commented 2019-09-27 19:27:39 +00:00
Author
Member
Copy Link

Fixed, thanks for clarifying that.

Fixed, thanks for clarifying that.
activities/routers/routers.en.xhtml Outdated
@ -39,0 +39,4 @@
<p>In order to protect this freedom, the <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2015.310.01.0001.01.ENG">article 3(1) of the Net Neutrality Directive</a> establishes that the enforcement of the respective open internet rules is task for the National Regulatory Authorities (NRAs) of each European country. They must check the application of the Directive’s rules accordingly to the technical guidelines of the Body of European Regulators for Electronic Communications (BEREC).</p>
<p>However, the awareness for such fundamental topic is still <a href="https://fsfe.org/activities/routers/timeline.html">very low</a> across Europe. Users are not being consciously informed about the risks of not having the freedom to choose their own equipment. It is unacceptable to limit Router Freedom on the basis of a arbitrary definition that only benefits ISPs and subjugates users to a very unfair and submissive situation.</p>
max.mehl commented 2019-09-23 13:36:34 +00:00
Owner
Copy Link

Could you explain why we link to the timeline here when it comes to the awareness?

Could you explain why we link to the timeline here when it comes to the awareness?
lucas.lasota commented 2019-09-27 19:28:10 +00:00
Author
Member
Copy Link

It was a bug. Inserted the right link to the wiki. Thanks!

It was a bug. Inserted the right link to the wiki. Thanks!
activities/routers/routers.en.xhtml Outdated
@ -39,2 +47,4 @@
<p>The infringement of the Router Freedom may happen by different restrictions, such as:</p>
<ol>
max.mehl commented 2019-09-23 13:34:38 +00:00
Owner
Copy Link

I would suggest to make this an unordered list since there is no weighting between the points. So <ul> instead of <ol>

I would suggest to make this an unordered list since there is no weighting between the points. So `<ul>` instead of `<ol>`
lucas.lasota commented 2019-09-27 19:28:22 +00:00
Author
Member
Copy Link

Done!

Done!
activities/routers/routers.en.xhtml Outdated
@ -99,3 +95,2 @@
<ul>
<li><a href="/activities/routers/timeline.html">Timeline of compulsory routers</a></li>
<li><a href="https://wiki.fsfe.org/Activities/CompulsoryRouters/Implementation/Germany">Status of the new law's implementation in Germany</a></li>
<li><a href="https://wiki.fsfe.org/Activities/CompulsoryRouters/">Router Freedom wiki page</a></li>
max.mehl commented 2019-09-23 13:37:27 +00:00
Owner
Copy Link

Please think of a more attractive name. What can people find there? Perhaps "Further information" or "Steps to get active"?

Please think of a more attractive name. What can people find there? Perhaps "Further information" or "Steps to get active"?
lucas.lasota commented 2019-09-27 19:29:47 +00:00
Author
Member
Copy Link

I like when we "defend rights or freedom". So I put "How to defend Router Freedom".

I like when we "defend rights or freedom". So I put "How to defend Router Freedom".
max.mehl changed title from new-router-freedom to Update Router Freedom pages 2019-09-24 13:20:38 +00:00
lucas.lasota commented 2019-09-27 19:30:30 +00:00
Author
Member
Copy Link

Fixed the spotted bugs and implemented the suggestions. Thank you, Max!

Fixed the spotted bugs and implemented the suggestions. Thank you, Max!
max.mehl commented 2019-10-03 12:23:26 +00:00
Owner
Copy Link

Sorry, just got around to review the changes.

I wonder why your last commit removed the paragraph starting with <p>In order to protect this freedom, the <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2015.310.01.0001.01.ENG">article 3(1) of the Net Neutrality Directive</a>.....

Was that an accident?

Sorry, just got around to review the changes. I wonder why your last commit removed the paragraph starting with `<p>In order to protect this freedom, the <a href="https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=uriserv:OJ.L_.2015.310.01.0001.01.ENG">article 3(1) of the Net Neutrality Directive</a>....`. Was that an accident?
lucas.lasota commented 2019-10-07 09:54:00 +00:00
Author
Member
Copy Link

After a general review, I realized that this paragraph was doubled in the code. That's why I deleted it :)

After a general review, I realized that this paragraph was doubled in the code. That's why I deleted it :)
max.mehl approved these changes 2019-10-07 09:56:39 +00:00
max.mehl closed this pull request 2019-10-07 09:57:05 +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#1074
No description provided.
Delete Branch "lucas.lasota/fsfe-website:new-router-freedom"

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?