Fix blockquote and table rendering

[xonotic/xonotic.wiki.git] / Repository_Access.textile

diff --git a/Repository_Access.textile b/Repository_Access.textile
index 77aba7247be57b14a39a9c52ad3c5ce2b1cee9e0..0a9923fe290b87ad50ad64f7b799b79e39c1f950 100644 (file)
--- a/Repository_Access.textile
+++ b/Repository_Access.textile
@@ -20,14 +20,13 @@ Ubuntu Dependencies (independent package x11-proto-devel dependencies fill the r
 <pre>
 sudo apt-get install build-essential xserver-xorg-dev x11proto-xf86dri-dev x11proto-xf86dga-dev x11proto-xf86vidmode-dev libxxf86dga-dev libxcb-xf86dri0-dev libxpm-dev libxxf86vm-dev libsdl1.2-dev libsdl-image1.2-dev libclalsadrv-dev libasound2-dev libxext-dev libsdl1.2debian libjpeg-turbo8-dev git-core unzip wget
 </pre>
-Note: If using i386 architecture, you can replace libdsl1.2debian by ibsdl1.2debian:i386 in the list above.
+Note: If using i386 architecture, you can replace libdsl1.2debian by ibsdl1.2debian:i386 in the list above. On Debian, use libjpeg8-dev if libjpeg-turbo8-dev isn't available in the package repositories. To be able to download maps from game servers when using Xonotic for online gaming, you will also need curl installed on your system.
 
 For Fedora and other RPM based distro's, compiling dependencies are as follows:
 <pre>
 x11-proto-devel, libalsa2-static-devel libjpeg62-devel libjpeg62-static-devel libSDL-devel
 </pre>
 
-
 h3. Windows
 
 By default, Windows has no real environment to handle the necessary scripting and compiling tools for building Xonotic... So, what we have to do is install something called "msysgit":https://code.google.com/p/msysgit/downloads/list to allow us to have a similar environment as on Linux. In this case, we want the download which is entirely self contained (including build-essentials and other corely required dependencies), which at the time of writing this is called "msysGit-fullinstall-1.8.0-preview20121022.exe." Simply follow the instructions on screen at this point. NOTE: Unless you know what you're doing, install with default settings/directories.
@@ -50,7 +49,9 @@ cd xonotic
 ./all update -l best
 </pre>
 
-The git:// protocol uses port 9418, which may be a problem if you're behind a strict firewall. You may instead use the clone url <pre>http://git.xonotic.org/xonotic/xonotic.git</pre>however using the git protocol directly is preferred for performance reasons.
+Take care do do these steps as normal user on Linux (not as a superuser), otherwise you'll have to take care about the file permissions later on.
+
+The git:// protocol uses port 9418, which may be a problem if you're behind a strict firewall. You may instead use the clone url <code>http://git.xonotic.org/xonotic/xonotic.git</code> (however, using the git protocol directly is preferred for performance reasons).
 
 After that, you have a working checkout of the repository. The game can be compiled and run with the following commands:
 <pre>
@@ -85,7 +86,7 @@ In case the code you pushed was not written by you, it is your responsibility to
 
 To apply for write access, make an issue of type "Support" in the category "Repository" and attach your public SSH key to it. (Windows users: see the Windows section below for more on SSH keys)
 
-h3. Linux/OS X
+h3. Windows/Linux/OS X
 
 Get a checkout (see above), and do:
 
@@ -148,16 +149,6 @@ Starts the Xonotic client
 
 Starts a Xonotic dedicated server
 
-
-h3. Windows
-
-To write your own changes to the Xonotic Git, do the following:
-* You must first have a putty SSH key, containing your private key. To generate one use "puttygen" : http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html which creates a ppk file. Choose SSH-2 RSA format and once the key has been generated save it as a private key.
-* Make sure the public key is accepted on the Git server. To find it, open the generated key in a text editor and read the "public-lines".
-* Open the Settings menu of Tortoise Git (right click anywhere in the folder you are setting this for) and go to Git -> Remote. Select "origin" for remote, "ssh://xonotic@push.git.xonotic.org/xonotic-data.pk3dir.git" as pushing URL (data.pk3dir is the example for the "data" branch, each pk3dir is separate!) and for Putty Key browse and select the key file previously mentioned.
-* In order to make a new branch, right click somewhere and choose Create Branch from the Tortoise Git context menu. This will create a local branch you can do anything with. Once you locally committed your changes to your branch, select Push to upload or update the branch on the Git server. From the Push window, choose your local branch for Local, leave Remote empty, and select origin for Destination.
-
-
 h2. General contributor guidelines
 
 # Before creating your local branch and committing to it, make sure you've configured your user settings such as your name which will display in the logs (in TortoiseGit: Settings -> Git - > Config).