Browse Source

Remove references to repo.or.cz

Bastien 1 year ago
parent
commit
d7ee56bbec

+ 0 - 12
dev/index.org

@@ -47,18 +47,6 @@ To clone a read-only version of the repo:
 
 : ~$ git clone https://code.orgmode.org/bzg/org-mode.git
 
-This repository is cloned on =repo.or.cz=:
-
-- http://repo.or.cz/w/org-mode.git
-
-You can display a graphic representation of the branches here:
-
-- http://repo.or.cz/git-browser/by-commit.html?r=org-mode.git
-
-# * TODO Merging into Emacs repository
-
-# We try to merge Org with Emacs regularily.
-
 * Reference documentation
 
 - [[file:org-syntax.org][Syntax reference (draft)]]

+ 0 - 2
index.org

@@ -159,8 +159,6 @@ A collection of generally useful code blocks available as a [[file:library-of-ba
 </noscript>
 #+end_export
 
-Note: You can also subscribe to changes via [[http://repo.or.cz/worg.git/rss][RSS]] or [[http://repo.or.cz/worg.git/atom][ATOM]] (both courtesy of repo.or.cz).
-
 * Git'r done!
 
 If you like losing your time by reading stuff on how to get organized,

+ 1 - 1
org-contrib/babel/examples/Rpackage.org

@@ -71,7 +71,7 @@ This document contains
   likely need to be changed.
 
 * Typical Workflow
- - [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/Rpackage.org][Download]] the =.org= version of this document
+ - [[https://code.orgmode.org/bzg/worg/src/master/org-contrib/babel/examples/Rpackage.org][Download]] the =.org= version of this document
  - Create a package directory (naming it like the package is convenient)
   - Copy the =.org= version of this document into that directory
   - Move point to the  =set up .Rbuildignore= headline and execute it

+ 1 - 1
org-contrib/babel/examples/ascii.org

@@ -1,8 +1,8 @@
+#+TITLE:      Org-babel: Uses
 #+OPTIONS:    H:3 num:nil toc:2 \n:nil ::t |:t ^:{} -:t f:t *:t tex:t d:(HIDE) tags:not-in-toc
 #+STARTUP:    align fold nodlcheck hidestars oddeven lognotestate hideblocks
 #+SEQ_TODO:   TODO(t) INPROGRESS(i) WAITING(w@) | DONE(d) CANCELED(c@)
 #+TAGS:       Write(w) Update(u) Fix(f) Check(c)
-#+TITLE:      Org-babel: Uses
 #+AUTHOR:     David Hajage
 #+EMAIL:      dhajage at gmail dot com
 #+LANGUAGE:   en

+ 2 - 3
org-contrib/babel/examples/org-check.org

@@ -488,9 +488,8 @@ Already up-to-date.
  1 files changed, 95 insertions(+), 66 deletions(-)
 Counting objects: 11, done.
 Delta compression using up to 2 threads.
-Compressing objects:  16% (1/6)   
Compressing objects:  33% (2/6)   
Compressing objects:  50% (3/6)   
Compressing objects:  66% (4/6)   
Compressing objects:  83% (5/6)   
Compressing objects: 100% (6/6)   
Compressing objects: 100% (6/6), done.
-Writing objects:  16% (1/6)   
Writing objects:  33% (2/6)   
Writing objects:  50% (3/6)   
Writing objects:  66% (4/6)   
Writing objects:  83% (5/6)   
Writing objects: 100% (6/6)   
Writing objects: 100% (6/6), 1.38 KiB, done.
-Total 6 (delta 5), reused 0 (delta 0)
+Compressing objects:  16% (1/6)
+...
 To git+ssh://repo.or.cz/srv/git/Worg.git
    108db30..25fb17b  master -> master
 #+end_example

+ 1 - 1
org-contrib/babel/uses.org

@@ -78,7 +78,7 @@ This document contains
  - tools useful for writing R extensions called /packages/
  - source code to create a simple R package
 
- [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/Rpackage.org][Download]] the =.org= version of this document and place it in either
+ [[https://code.orgmode.org/bzg/worg/src/master/org-contrib/babel/examples/Rpackage.org][Download]] the =.org= version of this document and place it in either
  an R package source directory or in a clean directory to get started.
 
 ** Tutorial on Emacs+ESS and Org+R by Stephen Eglen

+ 2 - 3
org-contribute.org

@@ -225,7 +225,7 @@ through public branches of your repository clone.
    firewall that blocks ~git://~, you can use the https url.
 
 2. Create a repository that can be publicly accessed, for example on
-   /GitHub/, /repo.or.cz/, or on your own server.
+   /GitHub/ or on your own server.
 
 3. Push your topic branches (and optionally the master branch) to your
    public repository.
@@ -250,8 +250,7 @@ through public branches of your repository clone.
 
    : git remote update
 
-   to pull commits from all defined remote repositories, in particular
-   the org-mode master at /repo.or.cz/.
+   to pull commits from all defined remote repositories.
 
 6. When you have something workable, publish the git path and branch
    name on the mailing list, so that people can test it and review

+ 1 - 12
org-faq.org

@@ -366,18 +366,6 @@ issue with mixed installations.
 
       : $ git clone git@code.orgmode.org:bzg/org-mode.git
 
-      You can also clone from this mirror (lagging one hour behind
-      orgmode.org repo):
-
-      : $ git clone git://repo.or.cz/org-mode.git
-
-      For those of you behind a firewall that allows only HTTP, you can
-      clone like this (can be somewhat slow), either from orgmode.org or
-      from repo.or.cz:
-
-      : $ git clone https://code.orgmode.org/bzg/org-mode.git
-      : $ git clone http://repo.or.cz/r/org-mode.git
-
    3. Compile and install Org-mode and build documentation.
 
       : $ cd $HOME/elisp/org-mode && make
@@ -663,6 +651,7 @@ system.
    available you already have the package manager installed.
 
    Steps for installing package manager on emacs-23:
+
    1. Download the package manager [[http://repo.or.cz/w/emacs.git/blob_plain/1a0a666f941c99882093d7bd08ced15033bc3f0c:/lisp/emacs-lisp/package.el][package.el]]
 
    2. Add the following to your =.emacs= and reload Emacs.

+ 3 - 3
worg-git-advanced.org

@@ -1,6 +1,6 @@
+#+TITLE:      Advanced usage of git for Worg
 #+STARTUP:    align fold nodlcheck hidestars oddeven lognotestate
 #+SEQ_TODO:   TODO(t) INPROGRESS(i) WAITING(w@) | DONE(d) CANCELED(c@)
-#+TITLE:      Advanced usage of git for Worg
 #+AUTHOR:     Worg people
 #+TAGS:       Write(w) Update(u) Fix(f) Check(c)
 #+EMAIL:      mdl AT imapmail DOT org
@@ -73,8 +73,8 @@ the =sendmail= command, please add this to =~/git/Worg/.git/config=:
 
 (Replace =AT= and =DOT= by the =@= and =.=)
 
-Then the =git send-email= command will send the patches directly to bzg
-(Bastien).
+Then the =git send-email= command will send the patches directly to
+Bastien.
 
 Use =git send-email= like this:
 

+ 5 - 5
worg-git-ssh-key.org

@@ -19,11 +19,11 @@ need to have a SSH key. What's that and how can you create one?
 #+index: Public key
 #+index: Private key
 
-A /public key/ is like a door lock, and a /private key/ is like the
-key. =Repo.or.cz= is asking you for the /public key/, that means, they
-ask you to provide a lock, and they will install your lock in their
-server. Then, with your /private key/ you will be able to open a
-connection to the server.
+A /public key/ is like a door lock, and a /private key/ is like the key.
+=Repo.or.cz= is asking you for the /public key/, that means, they ask you
+to provide a lock, and they will install your lock in their server.
+Then, with your /private key/ you will be able to open a connection to
+the server.
 
 Your /private key/ may be easy to use: just /have it/, and you can use
 it to open the lock.

+ 39 - 49
worg-git.org

@@ -13,9 +13,9 @@
 
 * What is git?
 
-[[http://git.or.cz][git]] is a fast version control system that lets you collaborate on a project.
-For details on how to use git, go and read the [[http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html][git tutorial]].  For details on
-the public git repository, please check it [[https://code.orgmode.org/bzg/worg][here]].
+[[http://git.or.cz][git]] is a fast version control system that lets you collaborate on a
+project.  For details on how to use git, go and read the [[http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html][git tutorial]].
+For details on the public git repository, please check it [[https://code.orgmode.org/bzg/worg][here]].
 
 The homepage of the Worg project is here: https://orgmode.org/worg/.
 
@@ -27,13 +27,9 @@ or
 
    : ~$ git clone git@code.orgmode.org:bzg/worg.git
 
-or by cloning the http mirror:
-
-   : ~$ git clone http://repo.or.cz/worg.git
-
-Since Worg is constantly updated you may want to update your copy of Worg
-before reading sometimes later.  To do so =cd= into the Worg directory and
-upgrade your copy of Worg with the command:
+Since Worg is constantly updated you may want to update your copy of
+Worg before reading sometimes later.  To do so =cd= into the Worg
+directory and upgrade your copy of Worg with the command:
 
    : ~$ git pull
 
@@ -46,8 +42,9 @@ If you want to contribute to Worg, keep reading.
 
 1. If you don't have a SSH-key, [[file:worg-git-ssh-key.org][create one]].
 
-2. Send your public key to [[mailto:bzgATgnuDOTorg][Bastien]] asking for push access and wait
-   for confirmation that you have push access.
+2. Create an account on https://code.orgmode.org.
+
+3. Add your public key on this account.
 
 4. Install =git= on your system. Tell =git= to use your private key with
    worg by updating =~/.ssh/config= with:
@@ -60,16 +57,6 @@ If you want to contribute to Worg, keep reading.
 
      : ~$ git clone git@code.orgmode.org:bzg/worg.git
 
-   If you already have your local clone of Worg obtained via http
-   protocol, you can easily tell your git to remain using =http= for
-   fetching and =git= for pushing, by adding to your =~/.gitconfig=:
-
-     : [url "git@code.orgmode.org:bzg/worg.git"]
-     :   pushInsteadOf = http://repo.or.cz/r/
-
-   which could come handy later on for any project you clone from
-   http://repo.or.cz
-
 6. Go to the newly created =worg/= directory and edit some files.
 
 7. If you created files, add them to the git index:
@@ -112,13 +99,14 @@ If you want to contribute to Worg, keep reading.
 
 ** Getting organized
 
-The Worg TODO file is =worg-todo.org=.  If you are a Worg zealot, maybe you
-want to add this file to the list of your agenda files.  For example, here
-is my =org-agenda-files= variable:
+The Worg TODO file is =worg-todo.org=.  If you are a Worg zealot, maybe
+you want to add this file to the list of your agenda files.  For
+example, here is my =org-agenda-files= variable:
 
   : (setq org-agenda-files '("~/org/bzg.org" "~/git/worg/worg-todo.org")
 
-I have an agenda custom command for checking tasks that are assigned to me:
+I have an agenda custom command for checking tasks that are assigned
+to me:
 
   : (org-add-agenda-custom-command '("W" tags "Owner=\"Bastien\""))
 
@@ -142,11 +130,12 @@ Now your changes will be filed under your name.
 
 ** Rebase to avoid merging commits
 
-It's good practice to pull the current version of the repository before
-making your own additions. But even if you do, someone might make a change
-while you are working. So it will often be necessary to pull immediately
-before pushing your new commit. In this situation, if you use =git pull=
-directly, then a 'merge commit' will be generated, looking like this:
+It's good practice to pull the current version of the repository
+before making your own additions. But even if you do, someone might
+make a change while you are working. So it will often be necessary to
+pull immediately before pushing your new commit. In this situation, if
+you use =git pull= directly, then a 'merge commit' will be generated,
+looking like this:
 
 #+begin_example
 commit aaaabbbbbbbbbaaaaaaaaabbbbbbbb
@@ -157,37 +146,38 @@ Date:   Wed Nov 24 00:00:01 2010 -0700
     Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
 #+end_example
 
-That's not a major problem, but it's nice to keep the commit logs free of
-this stuff. To avoid generating the merge commit, use the =--rebase= option
-when pulling:
+That's not a major problem, but it's nice to keep the commit logs free
+of this stuff. To avoid generating the merge commit, use the =--rebase=
+option when pulling:
 
 : ~$ git pull --rebase
 
-Basically this means that your commit will be put to the top of the stack,
-as if no one had made any additions while you were working. More advanced
-git users might make their changes in a personal branch, and then rebase
-that branch against a freshly pulled master branch before merging it in to
-master. The end result would be the same as pulling with =--rebase=.
+Basically this means that your commit will be put to the top of the
+stack, as if no one had made any additions while you were
+working. More advanced git users might make their changes in a
+personal branch, and then rebase that branch against a freshly pulled
+master branch before merging it in to master. The end result would be
+the same as pulling with =--rebase=.
 
 ** Dealing with line endings
 
-Unix, Windows and Mac all have different conventions for marking the end of
-a line. This might lead to problems when editing the same file across
-platforms. Github advises Linux users to automatically convert all external
-files to LF on committing (see
+Unix, Windows and Mac all have different conventions for marking the
+end of a line. This might lead to problems when editing the same file
+across platforms. Github advises Linux users to automatically convert
+all external files to LF on committing (see
 [[http://help.github.com/dealing-with-lineendings]]) by setting:
 
 : ~$ git config --global core.autocrlf input
 
-For Worg, this is the wrong solution, since there are already files with
-both end of line conventions in the repository.  Instead tell git locally
-not to convert files by setting:
+For Worg, this is the wrong solution, since there are already files
+with both end of line conventions in the repository.  Instead tell git
+locally not to convert files by setting:
 
 : ~$ git config core.autocrlf false
 
-Of course you have to be careful not to save Windows files as Unix files or
-vice versa, since this would lead to large and confusing diffs. This should
-not be a problem with Worg as
+Of course you have to be careful not to save Windows files as Unix
+files or vice versa, since this would lead to large and confusing
+diffs. This should not be a problem with Worg as
 
 - one rarely edits other people's files anyway, and
 - Emacs can deal with end of line conventions transparently.