diff options
| author | rsiddharth <s@ricketyspace.net> | 2021-03-17 23:11:19 -0400 |
|---|---|---|
| committer | rsiddharth <s@ricketyspace.net> | 2021-03-17 23:11:19 -0400 |
| commit | 5b2c089f811e1154c722606d8a78f13b6535f1e4 (patch) | |
| tree | 74e020c6e17f9702d494b4008f531141bcd92b40 | |
| parent | 16d2fcbc2857e3007670e356dd6c10820ebb42ea (diff) | |
| parent | b653596e59885e4c3bee06d4d582e8b62a58e07f (diff) | |
Merge remote-tracking branch 'f/master'
Fixed conflicts in md/article/education.md
| -rw-r--r-- | md/article/education.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/md/article/education.md b/md/article/education.md index 8f59b9b..d15be98 100644 --- a/md/article/education.md +++ b/md/article/education.md @@ -9,19 +9,19 @@ Computing, Modeling, and Simulation, Savitribai Phule Pune University [has been using free/swatantra software tools for more than 20 years and it's currently helping other departments at Savitribai Phule Pune University adopt free software][cs-unipune]. Free software [is readily -available for all activities in the digital classroom and should be -preferred over their proprietary counterparts][free-sw-edu]. +available][free-sw-edu] for all activities in the digital classroom +and should be preferred over their proprietary counterparts. [free-sw-edu]: https://www.gnu.org/software/free-software-for-education.html [cs-unipune]: https://fsf.org.in/case-study/unipune ## What is Free/Swatantra Software? -Free/Swatantra software means that you, as user, have the freedom to -run, study, modify, and redistribute the program. With these freedoms, -the users, both individually and collectively, control the program and -what it does for them. When users don't control the program, we call -it “nonfree” or “proprietary” +[Free/Swatantra software][free-sw] means that you, as user, have the +freedom to run, study, modify, and redistribute the program. With +these freedoms, the users, both individually and collectively, control +the program and what it does for them. When users don't control the +program, we call it “nonfree” or “proprietary” program. Proprietary software is an injustice to the user because it puts its developer or owner in a [position of power over its users][free-sw-imp]. The developer uses this power [to spy, restrict, @@ -98,9 +98,9 @@ Zoom, Google Meet, and Microsoft Teams are proprietary software generally used in live classes and webinars. All of them use their power over the users to collect personal and location data. Zoom [collects a lot of data][spm-zoom] on students. Microsoft Teams and -Google also [snoop on their users][verge-mz]. We urge teachers to -help their students in resisting against proprietary videoconferencing -platforms; some ideas are [listed here][gnu-rz]. +Google Meet also [snoop on their users][verge-mz]. We urge teachers +to help their students in resisting against proprietary +videoconferencing platforms; some ideas are [listed here][gnu-rz]. [spm-zoom]: https://studentprivacymatters.org/what-you-need-to-know-about-zoom-for-education [verge-mz]: https://www.theverge.com/2020/5/1/21244058/google-meet-microsoft-teams-webex-personal-data-collection-privacy-policy-concerns |