From 2ba314fd13bf2764b912610cc122cf92eaa9ae21 Mon Sep 17 00:00:00 2001 From: sceox Date: Tue, 17 May 2022 13:16:27 -0700 Subject: [PATCH 1/6] make note of ssg dependencies --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4154ee9..333b108 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ describes the lanuage syntax The rest of the heavy lifting is done by a modified version of [ssg](https://www.romanzolotarev.com/ssg.html) which is included -in this source code. +in this source code. ssg requires a POSIX /bin/sh, and awk. ## TODOs From 4b9ad66558820bb980c00398dd11ad9249c14608 Mon Sep 17 00:00:00 2001 From: sceox Date: Tue, 17 May 2022 13:17:50 -0700 Subject: [PATCH 2/6] fix typo and keep some words between links --- src/index.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/index.md b/src/index.md index fbab277..70ec16a 100644 --- a/src/index.md +++ b/src/index.md @@ -14,16 +14,16 @@ other. As well as being an infrastructure project, Anarchy Planet is a point of departure (a portal) for an entire world of autonomous -anarchist projects. This includes [an introduction to -anarchy](https://anarchy101.org), [a news site for -anarchists](https://anarchistnews.org), [a site where you can buy -anarchist ephemera](https://littleblackcart.com), a forum, [an -extensive archive of anarchist texts](https://theanarchistlibrary.org), -and [a site for review essays and intelligent -conversation](https://theanvilreview.org). +anarchist projects. This includes [an introduction](https://anarchy101.org) +to anarchy, [a news site](https://anarchistnews.org) for anarchists, +[a site](https://littleblackcart.com) where you can buy anarchist +books and ephemera, a forum, [an extensive +archive](https://theanarchistlibrary.org) of anarchist texts, and +[a site](https://theanvilreview.org) for review essays and intelligent +conversation. -We are also putting the infrastructure into place for future anarchist -projects and current anarchist opinion. This is collective project +We are also putting in place the infrastructure for future anarchist +projects and current anarchist opinion. This collective project will coordinate technology and human resources to fill needs as required by the residents of the Anarchy Planet. From 3b30f8f2f988ab8f784a8d8bc61a074057f93023 Mon Sep 17 00:00:00 2001 From: sceox Date: Tue, 17 May 2022 13:38:54 -0700 Subject: [PATCH 3/6] add anarchy.tube to projects --- src/projects.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/projects.md b/src/projects.md index 6541a61..76c6f7f 100644 --- a/src/projects.md +++ b/src/projects.md @@ -65,3 +65,9 @@ a board game or two. Anarchyplanet's free, federated social networking server built on open protocols! Like Twitter but better! + +[anarchy.tube](https://anarchy.tube/) + +Our node in the open and decentralized video platform +[peertube](https://joinpeertube.org/). Your looking glass into a strange +chaotic world. From 80dba140103d2a0b4bd0307b53f0aa703efa1f8f Mon Sep 17 00:00:00 2001 From: sceox Date: Sun, 31 Jul 2022 17:06:09 -0700 Subject: [PATCH 4/6] write some docs for how to make changes to the site --- README.md | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 333b108..42c8087 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,82 @@ This repo includes markdown files for [the Anarchy Planet web site](https://anarchyplanet.org/) and tools to generate a static HTML site from the source files. -You can see this method in action at -[https://testing.anarchyplanet.org](https://testing.anarchyplanet.org). - ## Contributing If you are familiar with editing markdown and using git, you should -already be able to figure out how to contribute. +already be able to figure out how to contribute. If not, or if you need a +refresher, keep reading. -TODO: write docs for someone who's not familiar with editing markdown -and/or using git. +There are two methods for contributing: direct write, and pull request. Direct +write is best if you are already known in Anarchy Planet, and pull request is +best if you are a newcomer. + +### Direct write + +#### Prerequisites + +You only have to do these steps once to get set up. + +Register an account on https://git.anarchyplanet.org. + +[Request](https://redmine.anarchyplanet.org/projects/anarchy-planet-support/issues/new) +write access to [this +repository](https://git.anarchyplanet.org/AnarchyPlanet/anarchyplanet-site). + +[Install a git client](https://git-scm.com/downloads). + +Configure git: + +``` +git config --global user.name +git config --global user.email +``` + +Clone this repository. + +``` +mkdir ~/projects +cd ~/projects +git clone https://git.anarchyplanet.org/AnarchyPlanet/anarchyplanet-site.git` +``` + +#### Making an edit + +Edit the `.md` files in your preferred editor. They are written in markdown, +which comes in different flavors. You you can [get an intro to markdown +here](https://www.markdownguide.org/) or read the syntax of the markdown flavor +we use [here](https://kristaps.bsd.lv/lowdown/lowdown.5.html). + +Change directory to the repository and commit your changes: + +``` +cd ~/projects/anarchyplanet-site +git add -p +git commit +``` + +When you do `git commit`, git will open an editor for you to write a commit +message. Write a short summary of the changes you made. + +Push your changes: + +``` +git push origin master +``` + +### Pull request + +Follow the "Direct write" instructions, but with the following differences: + +* Do not request write access. Instead, visit [this + repository](https://git.anarchyplanet.org/AnarchyPlanet/anarchyplanet-site) + in your browser and click the green fork button next to the branch label. +* When you clone, clone your fork. +* After you push your changes, visit [this + repository](https://git.anarchyplanet.org/AnarchyPlanet/anarchyplanet-site) + in your browser again and click the green pull request button next to the + branch label. +* Select the branch you made, and open the pull request. ## Dependencies From 5303da8b6f0be3c9d4cb249a7a1cf8f4e69e7cec Mon Sep 17 00:00:00 2001 From: sceox Date: Sun, 31 Jul 2022 17:08:33 -0700 Subject: [PATCH 5/6] separate the two contribution methods more clearly --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 42c8087..4ed35f6 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,11 @@ Push your changes: git push origin master ``` +All done! + ### Pull request +If you don't have direct write access, you can make a pull request instead. Follow the "Direct write" instructions, but with the following differences: * Do not request write access. Instead, visit [this From 2f75655c4cc9ab4356d274685a564493ad1431df Mon Sep 17 00:00:00 2001 From: rocinante Date: Mon, 1 Aug 2022 14:31:20 -0400 Subject: [PATCH 6/6] added projects, and also fixed up ABC order of projects. --- src/projects.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/projects.md b/src/projects.md index 76c6f7f..43cd4d1 100644 --- a/src/projects.md +++ b/src/projects.md @@ -9,11 +9,22 @@ The much-loved English language library of anarchist texts and texts of interest to anarchists. The Anarchist Library project also features libraries in many other languages. +[Anarchy Tube](https://anarchy.tube) + +A video platform hosted by anarchists that uses PeerTube technology. PeerTube +is a "free and open-source, decentralized, federated video platform." It provides +a place to watch, upload, and comment on videos and supports live streaming with +chat. + [Anarchy Planet IRC](https://irc.anarchyplanet.org) Come chat with us through the magic of IRC ([here's a how-to](https://anarchistnews.org/irc)). +[Anarchy Planet Jitsi](https://jitsi.anarchyplanet.chat) + +A Jitsi instance for voice and video calling. + [ANews Podcast](https://podcast.anarchistnews.org) The **only** audio source for anarchist news from the previous week. @@ -63,11 +74,5 @@ a board game or two. [a.nti.social](https://a.nti.social/) -Anarchyplanet's free, federated social networking server built on open +Anarchy Planet's free, federated social networking server built on open protocols! Like Twitter but better! - -[anarchy.tube](https://anarchy.tube/) - -Our node in the open and decentralized video platform -[peertube](https://joinpeertube.org/). Your looking glass into a strange -chaotic world.