From ede155d5ed1db03efc3448e111ac230770ef0b89 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Sun, 29 Nov 2020 18:04:52 +0100 Subject: [PATCH] Auto: misc. --- c2.md | 2 ++ journal/2020-11-29.md | 8 ++++++-- pr.md | 6 ++++++ ricardo-piglia.md | 10 +++++++++- ward-cunningham.md | 2 +- 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 pr.md diff --git a/c2.md b/c2.md index 470499b0e..1365b5432 100644 --- a/c2.md +++ b/c2.md @@ -1,9 +1,11 @@ # C2 +- Consultancy firm by [[ward cunningham]]. Known for hosting the first wiki. - [[go]] wiki.c2.com - The [[OG]]. [//begin]: # "Autogenerated link references for markdown compatibility" +[ward-cunningham]: ward-cunningham "Ward Cunningham" [go]: go "Go" [//end]: # "Autogenerated link references" \ No newline at end of file diff --git a/journal/2020-11-29.md b/journal/2020-11-29.md index 73f626256..4618026df 100644 --- a/journal/2020-11-29.md +++ b/journal/2020-11-29.md @@ -8,15 +8,16 @@ - [x] [[do]] take out garbage - [x] [[do]] take a walk - [x] [[send]] update to [[james baker]] -- [ ] [[do]] accept [[arghzero]]'s PR +- [ ] [[do]] accept [[arghzero]]'s [[PR]] - [x] check CLA in internal system - - [ ] merge + - [ ] merge: https://github.com/flancian/agora-server/pull/1/files - [ ] [[write]] in the meeting agenda doc for [[social knowledge graphs discussion]]. - [ ] [[do]] pay internet/phone bills - [ ] [[answer]] [[armengolaltayol]] - [ ] [[implement]] [[agora plan]] - noded [[federated wiki]] - noded [[sister sites]] +- fixed [[ricardo piglia]] [//begin]: # "Autogenerated link references for markdown compatibility" [daily]: ../daily "Daily" @@ -26,6 +27,9 @@ [write]: ../write "Write" [james-baker]: ../james-baker "James Baker" [arghzero]: ../arghzero "Arghzero" +[pr]: ../pr "PR" [social-knowledge-graphs-discussion]: ../social-knowledge-graphs-discussion "Social Knowledge Graphs Discussion" [agora-plan]: ../agora-plan "Agora Plan" +[federated-wiki]: ../federated-wiki "Federated Wiki" +[sister-sites]: ../sister-sites "Sister Sites" [//end]: # "Autogenerated link references" \ No newline at end of file diff --git a/pr.md b/pr.md new file mode 100644 index 000000000..0b8fd28e7 --- /dev/null +++ b/pr.md @@ -0,0 +1,6 @@ +# PR + +- A Pull Request. A flow in which one person requests that a change they've made in a fork of a [[git]] repository is incorporated into another branch. +- The usual way to contribute patches to projects in [[git]]. +- A [[github]] concept, not core to [[git]] proper. + diff --git a/ricardo-piglia.md b/ricardo-piglia.md index 574cf8f6b..28aad0721 100644 --- a/ricardo-piglia.md +++ b/ricardo-piglia.md @@ -57,7 +57,7 @@ El presente no existe en la Argentina sino como una aspiración. Mansilla pasa una noche en prisión y se va a Paraná, donde está Urquiza. Se queda sin plata; va a una inaguración y el gobernador le ofrece dinero para escribir una narración sobre la inauguración. Mansilla se decidió a "escribir como se habla". 25 años después escribe Una Excursión a los Indios Ranqueles. -María Moreno: sedujo al gobernador. Berlén (sp?) habla de Mansilla como enamorado de él: buenmozo, bien vestido, muy inteligente. Si Mansilla remplazaba a Rimbaud teníamos una historia distinta. +María Moreno: sedujo al gobernador. [[Verlaine]] habla de Mansilla como enamorado de él: buenmozo, bien vestido, muy inteligente. Si Mansilla remplazaba a Rimbaud teníamos una historia distinta. En Ranqueles, comienza hablando de la vejez. Escribir sería el fin de la experiencia. @@ -286,6 +286,14 @@ Piglia: Ayra. [[Héctor Libertella]]. "Veo la presencia de Macedonio en aquellos [//begin]: # "Autogenerated link references for markdown compatibility" [person]: person "Person" [l]: l. "L." +[borges-por-piglia]: borges-por-piglia "Borges, por Piglia" [juan-sasturain]: juan-sasturain "Juan Sasturain" +[roberto-arlt]: roberto-arlt "Roberto Arlt" [ancla]: ancla "Ancla" +[juan-carlos-onetti]: juan-carlos-onetti "Juan Carlos Onetti" +[la-vida-breve]: la-vida-breve "La Vida Breve" +[adán-buenosayres]: adán-buenosayres "Adán Buenosayres" +[rayuela]: rayuela "Rayuela" +[piglia]: piglia "Piglia" +[ricardo-piglia]: ricardo-piglia "Ricardo Piglia" [//end]: # "Autogenerated link references" diff --git a/ward-cunningham.md b/ward-cunningham.md index 268a756c3..262346088 100644 --- a/ward-cunningham.md +++ b/ward-cunningham.md @@ -3,7 +3,7 @@ - A [[person]]. - [[twitter]] https://twitter.com/wardcunningham - The [[OG]]. -- Founder of [[c2]] and cofounder of [[wikipedia]]. +- Founder of [[c2]]. [//begin]: # "Autogenerated link references for markdown compatibility"