Browse Source

Replace references to repo.or.cz with pointers to orgmode.org.

Bastien Guerry 8 years ago
parent
commit
c9ac7c8e02

+ 1 - 1
code/elisp/org-issue.el

@@ -134,7 +134,7 @@
 ;;
 
 ;;; Code:
-(defcustom org-issue-issue-file "~/code/org-mode/Worg/org-issues.org"
+(defcustom org-issue-issue-file "~/code/org-mode/worg/org-issues.org"
   "Path to Org mode's issue file."
   :type 'file
   :group 'org-issue)

+ 1 - 1
code/elisp/worg.el

@@ -28,7 +28,7 @@
 ;;; Commentary:
 ;;
 ;; This file provides dynamic blocks for editing Worg pages.
-;; See the Worg project here: http://repo.or.cz/w/Worg.git
+;; See the Worg project here: http://orgmode.org/w/worg.git
 ;;
 ;; Put this file into your load-path and the following into your ~/.emacs:
 ;;   (require 'worg)

+ 1 - 1
code/org-info-js/index.org

@@ -47,7 +47,7 @@
    (http://github.com/SebastianRose/org-info-js/tree/master), but every working
    release is published here on Worg synchronously. That said, you can follow
    the development by tracking the Worg repo as well, available at
-   [[http://repo.or.cz/w/Worg.git]].
+   [[http://orgmode.org/w/worg.git]].
 
 ** Terms used throughout this Document
    :PROPERTIES:

+ 2 - 2
index.org

@@ -148,9 +148,9 @@ Matthew Lundin, a group of [[file:worgers.org][Worg contributors]], and maybe [[
 - Howtos
   - [[file:worg-git.org][An introduction to git for Worgers]]
   - [[file:worg-editing.org][Conventions and tools for editing Worg]]
-  - [[file:worg-git-ssh-key.org][How to create your own SSH key for repo.or.cz?]]
+  - [[file:worg-git-ssh-key.org][How to create your own SSH key?]]
 - Miscellaneous
-  - [[http://repo.or.cz/w/Worg.git][Recent changes to Worg]] (git log at repo.or.cz)
+  - [[http://orgmode.org/w/worg.git][Recent changes to Worg]] (git log at /orgmode.org/)
   - [[http://orgmode.org/worg/sources/][Org-mode source documents of all Worg pages]]
 
 ** Latest changes to the Worg git repository

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

@@ -19,7 +19,7 @@ Check an Org-mode environment.
  buffer both safe and useful.
 
 * Instructions
-  - Download the file [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/org-check.org][org-check.org]]
+  - Download the file [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/org-check.org%3Bh%3Dc6e25782c8fa781990d28676052af6006099cf96%3Bhb%3DHEAD][org-check.org]]
   - Calculate the table by putting point in the table and pressing =C-u C-c *=
   - Check the =results= column
     - if you see all "pass" results, then your environment passes
@@ -459,9 +459,9 @@ Many thanks to the following people for their generous help:
 ** Source
 #+srcname: copy-to-worg
 #+begin_src sh :exports none :results output
-  cd ~/org/Worg/
+  cd ~/org/worg/
   git pull
-  cp ~/org/org-check/org-check.org  ~/org/Worg/org-contrib/babel/examples/org-check.org
+  cp ~/org/org-check/org-check.org  ~/org/worg/org-contrib/babel/examples/org-check.org
   git add org-contrib/babel/examples/org-check.org
   git commit -m "Additions to org-check.org"
   git push

+ 4 - 5
org-contrib/babel/languages.org

@@ -121,11 +121,10 @@ functionality in an incremental fashion -- Babel will make use of
 those functions which are available, and will fail gracefully when
 functionality has not yet been implemented.
 
-There is a short Emacs Lisp template ([[http://repo.or.cz/w/Worg.git/blob/HEAD:/org-contrib/babel/ob-template.el][ob-template.el]]) which can be
-used as a starting point for implementing support for new languages.
-Developers are encouraged to read the [[file:~/src/worg/org-contribute.org][Org-mode contribution
-instructions]] in the hopes that the language support can be included
-into the Org-mode core.
+There is a short Emacs Lisp template ([[http://orgmode.org/w/worg.git/blob/HEAD:/org-contrib/babel/ob-template.el][ob-template.el]]) which can be used as
+a starting point for implementing support for new languages.  Developers
+are encouraged to read the [[file:~/install/git/worg/org-contribute.org][Org-mode contribution instructions]] in the hope
+that the language support can be included into the Org-mode core.
 
 * Footnotes
 

File diff suppressed because it is too large
+ 2 - 2
org-contrib/babel/languages/ob-doc-R.org


+ 14 - 13
org-contrib/babel/uses.org

@@ -18,7 +18,7 @@
 
 * [[file:how-to-use-Org-Babel-for-R.org][Tutorial Org/Babel/R by Feiming Chen]]
 * [[file:examples/data-collection-analysis.org][Data Collection and Analysis]]
-  (raw file available at [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/data-collection-analysis.org][data-collection-analysis.org]])
+  (raw file available at [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/data-collection-analysis.org%3Bhb%3DHEAD][data-collection-analysis.org]])
 
   This example uses Babel to automate a repeated data-collection
   and analysis task.  A Ruby code block is used to scrape data from
@@ -42,7 +42,7 @@
   in emacs. The HTML export version is [[file:examples/drift.org][here]].
 
 * [[file:examples/org-check.org][Checking Your Org-Mode Configuration]]
-  (raw file available at [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/org-check.org][org-check.org]])
+  (raw file available at [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/org-check.org%3Bhb%3DHEAD][org-check.org]])
 
   This example runs some diagnostic checks to see if your system and
   Org-mode are configured to accomplish various tasks.  It is
@@ -52,7 +52,7 @@
   Org-mode users.
 
 * [[file:examples/latex-form.org][A LaTeX Form]]
-  (raw file available at [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/latex-form.org][latex-form.org]])
+  (raw file available at [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/latex-form.org%3Bhb%3DHEAD][latex-form.org]])
 
   This example uses Babel as a user interface for a LaTeX form
   that might be used by the members of an organization.  It uses the
@@ -64,7 +64,7 @@
   file cabinet.
 
 * [[file:examples/short-report.org][A Standardized Short Report]]
-  (raw file available at [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/short-report.org][short-report.org]])
+  (raw file available at [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/short-report.org%3Bhb%3DHEAD][short-report.org]])
 
   This example is similar to the previous one, but here the users are
   expected to write substantial content.  This type of workflow might
@@ -82,26 +82,27 @@
   different from which they appear in the report.
 
 * [[file:examples/ascii.org][A Example Using Ascii Package]]
-  (raw file available at [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/ascii.org][ascii.org]])
+  (raw file available at [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/ascii.org%3Bhb%3DHEAD][ascii.org]])
 
   This example shows how to use Babel with =R= and =ascii= package.
 
-* [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/foo.org.html][/An Babel Demo/ -- A Comparison to Sweave]]
+* [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob%3Bf%3Dorg-contrib/babel/examples/foo.org.html%3Bh%3D3d157d2ac1b361eea9afc71436a3b0a23a5f1070%3Bhb%3DHEAD][/An Babel Demo/ -- A Comparison to Sweave]]
   :PROPERTIES:
   :CUSTOM_ID: foo
   :END:
-[[http://www.stat.umn.edu/~charlie/][Charlie Geyer]] created an excellent short demonstration of Sweave
-entitled /An Sweave Demo/ available at [[http://www.stat.umn.edu/~charlie/Sweave/][his Sweave page]].  There is now
-an Babel version of this demonstration entitled /An Babel
-Demo/ which matches Charlie's document word for word (as much as
-possible) and figure for figure with all the examples implemented
-using Babel instead of Sweave.
+
+[[http://www.stat.umn.edu/~charlie/][Charlie Geyer]] created an excellent short demonstration of Sweave entitled
+/An Sweave Demo/ available at [[http://www.stat.umn.edu/~charlie/Sweave/][his Sweave page]].  There is now an Babel
+version of this demonstration entitled /An Babel Demo/ which matches
+Charlie's document word for word (as much as possible) and figure for
+figure with all the examples implemented using Babel instead of Sweave.
 
 Compare the two side-by-side.
+
 |        | source                                  | pdf     |
 |--------+-----------------------------------------+---------|
 | Sweave | [[http://www.stat.umn.edu/~charlie/Sweave/foo.Rnw][foo.Rnw]]                                 | [[http://www.stat.umn.edu/~charlie/Sweave/foo.pdf][foo.pdf]] |
-| Babel  | [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/foo.org][foo.org]] ([[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/foo.org.html][foo.org.html]] as seen in Emacs) | [[http://repo.or.cz/w/Worg.git/blob_plain/HEAD:/org-contrib/babel/examples/foo.pdf][foo.pdf]] |
+| Babel  | [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/foo.org%3Bhb%3DHEAD][foo.org]] ([[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/foo.org.html%3Bhb%3DHEAD][foo.org.html]] as seen in Emacs) | [[http://orgmode.org/w/?p%3Dworg.git%3Ba%3Dblob_plain%3Bf%3Dorg-contrib/babel/examples/foo.pdf%3Bhb%3DHEAD][foo.pdf]] |
 
 * [[file:examples/finances.org][Tracking finances]]
 :PROPERTIES:

+ 0 - 2
org-contrib/index.org

@@ -8,8 +8,6 @@
 #+LANGUAGE:   en
 #+CATEGORY:   worg
 
-#+LINK: repofile http://repo.or.cz/w/org-mode.git?a=blob_plain;f=%s;hb=HEAD
-
 [[file:../index.org][{Back to Worg's index}]]
 
 This page lists the contributed packages to Org-mode, with links to

+ 2 - 2
org-contribute.org

@@ -196,8 +196,8 @@ 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, in particular the
+   org-mode master at /orgmode.org/ (or its clone at /repo.or.cz/.)
 
 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 - 1
org-issues.org

@@ -14907,7 +14907,7 @@ CLOSED: [2010-11-22 Mo 21:43]
    :ARCHIVE_CATEGORY: worg
    :ARCHIVE_TODO: DONE
    :END:
-    - Worg repo commit: http://repo.or.cz/w/Worg.git/commitdiff/f5814f05998292d4eb80f9772c279e9837644f29
+    - Worg repo commit: http://orgmode.org/w/worg.git/commitdiff/f5814f05998292d4eb80f9772c279e9837644f29
 ** DONE (bug) overprotective begin/end during latex export
  [2010-06-13 So]
  :PROPERTIES:

+ 1 - 1
org-tutorials/tables.org

@@ -12,7 +12,7 @@
 [[file:../index.org][{Back to Worg's index}]]
 
 This tutorial briefly describes the use of tables with Org.  You can
-freely improve this tutorial by editing [[file:~/org/Worg/index.org][Worg]].
+freely improve this tutorial by editing [[file:~/org/worg/index.org][Worg]].
 
 * Creating a table
 

+ 1 - 2
worg-about.org

@@ -58,8 +58,7 @@ page describing how to use [[file:worg-git.org][git for editing Worg]] for detai
 
 * Do I need to register somewhere?
 
-It's better to register on http://repo.or.cz/reguser.cgi but you can
-also add changes to the Worg repository anonymously.
+No.  You just need to send your public key to Jason or Bastien.
 
 * So what is contained in Worg?
 

+ 44 - 31
worg-git-ssh-key.org

@@ -1,9 +1,9 @@
+#+TITLE:      Creating a SSH-key for a new user
+#+AUTHOR:     Worg people
+#+EMAIL:      mdl AT imapmail DOT org
 #+STARTUP:    align fold nodlcheck hidestars oddeven lognotestate
 #+SEQ_TODO:   TODO(t) INPROGRESS(i) WAITING(w@) | DONE(d) CANCELED(c@)
-#+TITLE:      Creating a SSH-key for a new user in repo.or.cz
-#+AUTHOR:     Worg people
 #+TAGS:       Write(w) Update(u) Fix(f) Check(c)
-#+EMAIL:      mdl AT imapmail DOT org
 #+LANGUAGE:   en
 #+PRIORITIES: A C B
 #+CATEGORY:   worg
@@ -11,11 +11,14 @@
 
 [[file:index.org][{Back to Worg's index}]]
 
-To [[http://repo.or.cz/reguser.cgi][register]] in http://repo.or.cz/ you need to have a SSH key. What's
-that and how can you create one?
+To push commits to the Worg repository at http://orgmode.org/w/worg.git you
+need to have a SSH key. What's that and how can you create one?
 
 * Public and private keys
 
+#+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
@@ -36,7 +39,9 @@ you must have the /public key/ *and* know the password).
 
 So: *use a passphrase* for more security.
 
-* Steps to create your private and public keys for repo.or.cz
+* Steps to create your private and public keys
+
+#+index: ssh-keygen
 
 1. Run =ssh-keygen= with no parameters. If you want to change the
    encryption algorithm used, see [[*RSA or DSA][the section below]].
@@ -54,47 +59,55 @@ So: *use a passphrase* for more security.
 
  - =id_rsa.pub=: that's your new /public key/. You can distribute it.
 
- - You will also see a /fingerprint/ (like
-   =31:c0:5a:92:70:5e:91=... etc).
+ - You will also see a /fingerprint/ (like =31:c0:5a:92:70:5e:91=... etc).
 
 5. Look at the public key. If you don't like the user name which appears
    at the end, re-run =ssh-keygen -C "comment that you want" =
 
-6. Copy and paste the /public/ key (the contents of =id_rsa.pub=) in the
-   text box in http://repo.or.cz/reguser.cgi
+* RSA or DSA?
 
-7. In "/login/", write the user name you want to have in this server
+#+index: RSA
+#+index: DSA
 
-8. Write also your e-mail
+You can decide if at the key creation you want to use the algorithm RSA or
+the algorithm DSA.
 
-9. Click the button "/Register/"
+If you know which one you like, you're lucky; use it!
 
-10. Now you must ask the administrator to give you "push"-access: to
-    allow you to upload contents to the project.
+If not, decide one; both will work.
 
-11. If you chose a user name for repo.or.cz that is different than
-    your login name, you might adjust the ssh client to use the
-    user name for repo.or.cz name when connecting.
+By default, =ssh-keygen= uses RSA, but you can use =ssh-keygen -t dsa= to
+use DSA.
 
-    This can be done by putting two lines like these in the file
-    .ssh/config:
+* Appendice: How to use this key to create an account on =repo.or.cz=?
 
-    #+begin_src conf
-      Host repo.or.cz
-           User <user at repo.or.cz>
-    #+end_src
+*Note*: this section was useful when worg.git was hosted on =repo.or.cz=
+instead of =orgmode.org=, before december 2011.  We leave it here, so that
+it is useful for other project than Worg.
 
-* RSA or DSA?
+1. Copy and paste the /public/ key (the contents of =id_rsa.pub=) in the
+   text box in http://repo.or.cz/reguser.cgi
 
-You can decide if at the key creation you want to use the algorithm RSA
-or the algorithm DSA.
+2. In "/login/", write the user name you want to have in this server
 
-If you know which one you like, you're lucky; use it!
+3. Write also your e-mail
 
-If not, decide one; both will work.
+4. Click the button "/Register/"
+
+5. Now you must ask the administrator to give you "push"-access: to
+   allow you to upload contents to the project.
+
+6. If you chose a user name for =repo.or.cz= that is different than your
+   login name, you might adjust the ssh client to use the user name for
+   =repo.or.cz= name when connecting.
+
+   This can be done by putting two lines like these in the file
+   =.ssh/config=:
 
-By default, =ssh-keygen= uses RSA, but you can use =ssh-keygen -t dsa=
-to use DSA.
+   #+begin_src conf
+     Host repo.or.cz
+          User <user at repo.or.cz>
+   #+end_src
 
 # ----------------------------
 #

+ 52 - 145
worg-git.org

@@ -1,9 +1,9 @@
-#+STARTUP:    align fold nodlcheck hidestars oddeven lognotestate
-#+SEQ_TODO:   TODO(t) INPROGRESS(i) WAITING(w@) | DONE(d) CANCELED(c@)
 #+TITLE:      How to use git to edit Worg files?
 #+AUTHOR:     Worg people
-#+TAGS:       Write(w) Update(u) Fix(f) Check(c)
 #+EMAIL:      mdl AT imapmail DOT org
+#+STARTUP:    align fold nodlcheck hidestars oddeven lognotestate
+#+SEQ_TODO:   TODO(t) INPROGRESS(i) WAITING(w@) | DONE(d) CANCELED(c@)
+#+TAGS:       Write(w) Update(u) Fix(f) Check(c)
 #+LANGUAGE:   en
 #+PRIORITIES: A C B
 #+CATEGORY:   worg
@@ -15,19 +15,18 @@
 
 [[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, go and read the [[http://repo.or.cz/about.html][about page]] of
-http://repo.or.cz/.
+the public git repository, please check it [[http://orgmode.org/w/worg.git][here]].
 
-The homepage of the Worg project is here: http://repo.or.cz/w/Worg.git
+The homepage of the Worg project is here: http://orgmode.org/w/worg.git.
 You can get a read-only clone of the repository with the command:
 
-   : ~$ git clone http://repo.or.cz/r/Worg.git
+   : ~$ git clone git://orgmode.org/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 http://repo.or.cz/r/Worg.git
+   : ~$ git pull
 
 If you want to contribute to Worg, keep reading.
 
@@ -38,36 +37,26 @@ 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. Register a [[http://repo.or.cz/reguser.cgi][new account]] on the git public repository (don't forget to
-   copy paste your public SSH key from =~/.ssh/id_rsa.pub= to the
-   registration form.)
+2. Send your public key to [[mailto:jasonATdunsmorDOTcom][Jason]] or [[mailto:bzgATgnuDOTorg][Bastien]] asking for push access and wait
+   for confirmation that you have push access.
 
-3. *Drop an email to* [[mailto:mdl%20AT%20imapmail%20DOT%20org][Matt Lundin]] mentioning your username on repo.or.cz.
-
-4. Install git on your system.
+4. Install =git= on your system.
 
 5. Clone the project somewhere in a working directory:
 
-   - If your user name in the shell is the same as the =Login=
-     [[http://repo.or.cz/reguser.cgi][registered at repo.or.cz]]:
-
-     : ~$ git clone git+ssh://repo.or.cz/srv/git/Worg.git
-
-   - else add the =Login= [[http://repo.or.cz/reguser.cgi][registered at repo.or.cz]] to <UserName>:
-
-     : ~$ git clone git+ssh://<UserName>@repo.or.cz/srv/git/Worg.git
+     : ~$ git clone worg@orgmode.org: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+ssh for pushing, by adding to your ~/.gitconfig:
+   protocol, you can easily tell your git to remain using =http= for
+   fetching and =git= for pushing, by adding to your ~/.gitconfig:
 
-     : [url "git+ssh://<UserName>@repo.or.cz/srv/git/"]
+     : [url "git://worg@orgmode.org: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.
+6. Go to the newly created =worg/= directory and edit some files.
 
 7. If you created files, add them to the git index:
 
@@ -79,26 +68,11 @@ If you want to contribute to Worg, keep reading.
 
 9. Push your change to Worg:
 
-   - If your user name in the shell is the same as the
-     =Login= [[http://repo.or.cz/reguser.cgi][registered at repo.or.cz]]:
-
      : ~$ git push
 
-   - else add the =Login= [[http://repo.or.cz/reguser.cgi][registered at repo.or.cz]] to <UserName>:
-
-     : ~$ git remote add public git+ssh://<UserName>@repo.or.cz/srv/git/Worg.git
-
-     Then do a:
-
-     : ~$ git push public
-
-     If you get a git error message looking like the one at the bottom
-     of this page, then this means that you've forgotten to drop a mail
-     to Matt (see step 3).
-
 * The second time you contribute to Worg
 
-1. Go to your =Worg/= directory.
+1. Go to your =worg/= directory.
 
 2. Be sure to "pull" the last version of the repository.
 
@@ -116,13 +90,14 @@ If you want to contribute to Worg, keep reading.
    : ~$ git push
 
 * Going deeper
+
 ** 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:
 
-  : (setq org-agenda-files '("~/org/bzg.org" "~/git/Worg/worg-todo.org")
+  : (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:
 
@@ -147,12 +122,12 @@ Now your changes will be filed under your name.
 # I'm not sure this is useful at all:
 
 ** 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
@@ -163,110 +138,42 @@ 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
+: ~$ 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:
-: $ 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
-  - one rarely edits other people's files anyway, and
-  - Emacs can deal with end of line conventions transparently.
-
-** Git usage for people who just want to send patches
-
-See [[file:worg-git-advanced.org][this page]].
-
-* COMMENT Anonymous editing through the "mob" user/branch
-
-If you don't want to register a new account on =repo.or.gz= but still
-want to suggest modifications on Worg, you can do this by editing the
-"mob" branch of Worg.  For details about the =mob= user, check [[http://repo.or.cz/mob.html][this
-webpage]] on repo.or.cz
-
-This branch is usually empty, since interesting changes are quickly
-merged into the master branch.  But it is important to make sure that
-you pull all changes in any existing =mob= branch before trying to push
-yours.
-
-1. Clone the Worg project as the =mob= user:
-
-   : ~$ git clone git+ssh://mob@repo.or.cz/srv/git/Worg.git
-
-2. Check out the "mob" branch to avoid conflicts between the =mob=
-   branch that you will soon create and any existing =mob= branch:
-
-   : ~$ git checkout origin/mob
-
-   You should get this warning:
 
-   : Note: moving to "origin/mob" which isn't a local branch
-   : If you want to create a new branch from this checkout, you may do so
-   : now or later) by using -b with the checkout command again. Example:
-   : git checkout -b <new_branch_name>
-
-   Don't worry.
-
-3. Create a new branch named =mob= from this checkout:
-
-   : ~$ git checkout -b mob
-
-4. Edit the files, add new files (=git-add=) and commit (=git-commit=)
-   them as usual.
-
-5. Push the =mob= branch into the Worg remote directory:
-
-   : ~$ git push origin mob
-
-You're done!
+: $ git config --global core.autocrlf input
 
-# FIXME:
+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:
 
-# What if two people edit Worg at the same time?
-# bzg [2009-07-15 mer]: No problem.  Just try to push and resolve
-# conflicts if any.
+: $ git config core.autocrlf false
 
-# Can I have private sections in Worg?
-# bzg [2009-07-15 mer]: Sure.  Just add an :AUTHOR: property in
-# the property drawer.
+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
 
-* Example error message
+- one rarely edits other people's files anyway, and
+- Emacs can deal with end of line conventions transparently.
 
-Git error message, when you don't have push permissions to Worg:
+** Git usage for people who just want to send patches
 
-       : % git push
-       : Counting objects: 5, done.
-       : Delta compression using up to 2 threads.
-       : Compressing objects: 100% (3/3), done.
-       : Writing objects: 100% (3/3), 463 bytes, done.
-       : Total 3 (delta 2), reused 0 (delta 0)
-       : error: unable to create temporary sha1 filename ./objects/64: File exists
-       :
-       : fatal: failed to write object
-       : error: unpack failed: unpacker exited with error code
-       : To git+ssh://myUserName@repo.or.cz/srv/git/Worg.git
-       :  ! [remote rejected] master -> master (n/a (unpacker error))
-       : error: failed to push some refs to
-       :   'git+ssh://myUserName@repo.or.cz/srv/git/Worg.git'
+See [[file:worg-git-advanced.org][this page]].
 

+ 1 - 1
worg-maintainance.org

@@ -17,7 +17,7 @@
 
 ** Maintainer role
 
-- give push access to new contributors in [[http://repo.or.cz/w/Worg.git][Worg.git]]
+- give push access to new contributors in [[http://orgmode.org/w/worg.git][worg.git]]
 - access to the server and fix possible publishing issues from there
 
 * Worg gardners

+ 2 - 2
worg-setup.org

@@ -100,9 +100,9 @@ version. To do this, simply link to the file in the worg sources directory:
      export PATH=$PATH:/home/you/bin/
 
      # go to the place where you pull Worg
-     cd /home/you/git/Worg/;
+     cd /home/you/git/worg/;
 
-     # pull Worg
+     # pull worg
      /home/you/bin/git-pull
      #+END_SRC