[Savannah-cvs] [101] long lines, some typos

[karl]

Revision: 101
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=administration&revision=101
Author:   karl
Date:     2014-10-09 17:34:47 +0000 (Thu, 09 Oct 2014)
Log Message:
-----------
long lines, some typos

Modified Paths:
--------------
    trunk/sviki/CvSToSvN.mdwn
    trunk/sviki/MailSystem.mdwn
    trunk/sviki/RunningSavaneLocally.mdwn
    trunk/sviki/SavaneInABox.mdwn
    trunk/sviki/SavaneTasks.mdwn
    trunk/sviki/SavannahHackersCommunication.mdwn
    trunk/sviki/UsingGnuArch.mdwn

Modified: trunk/sviki/CvSToSvN.mdwn
===================================================================
--- trunk/sviki/CvSToSvN.mdwn   2014-10-04 01:55:04 UTC (rev 100)
+++ trunk/sviki/CvSToSvN.mdwn   2014-10-09 17:34:47 UTC (rev 101)
@@ -46,7 +46,7 @@
 
 Note that if you work on Unix only, you're likely to only work with
 "text" files: CVS does \_not\_ set files as binary (cvs admin -kb)
-automatically (not by analysing content, _nor by extension_, unless
+automatically (not by analyzing content, _nor by extension_, unless
 extensions are mentioned in CVSROOT/cvswrappers or ./.cvswrappers, and
 that's only at import/add time, this has to be manually fixed later. For
 example, I had to run either of those to fix the Savane PNGs:

Modified: trunk/sviki/MailSystem.mdwn
===================================================================
--- trunk/sviki/MailSystem.mdwn 2014-10-04 01:55:04 UTC (rev 100)
+++ trunk/sviki/MailSystem.mdwn 2014-10-09 17:34:47 UTC (rev 101)
@@ -79,7 +79,7 @@
 All other systems delegate sending mail to `internal`.
 
 A Savane cron job creates alias tables: `/etc/aliases` and
-`/etc/email-adresses`. This is used to map Unix user accounts to an
+`/etc/email-addresses`. This is used to map Unix user accounts to an
 outgoing email, based on the `email' field in the user's Savane
 account.  Alias tables are only updated on `internal'.
 

Modified: trunk/sviki/RunningSavaneLocally.mdwn
===================================================================
--- trunk/sviki/RunningSavaneLocally.mdwn       2014-10-04 01:55:04 UTC (rev 
100)
+++ trunk/sviki/RunningSavaneLocally.mdwn       2014-10-09 17:34:47 UTC (rev 
101)
@@ -1,25 +1,25 @@
-# GNU Savane - Local Demo
+# Running Savane Locally - howto
 
-"Savane" is the code name for the server project running
-[GNU Savannah](http://savannah.gnu.org).
+"Savane" is the code name for the server software that runs
+[GNU Savannah](http://savannah.gnu.org), among other things.
 
-* Project's page: <http://savannah.gnu.org/projects/administration>
+* Project page: <http://savannah.gnu.org/projects/administration>
 
 "Savane" has many parts. This page describes a method to run
 a locally copy of Savane **frontend PHP part** on your computer.
 
 "Savane" is an old, delicate beast and is quick to anger.
 Tread lightly and send questions to <address@hidden>
-(previous discussions at:
+(archive:
 <http://lists.gnu.org/archive/html/savannah-hackers-public/>).
 
 The following instructions have been tested on **Debian 7**, running as
 **non-root** user. Other configurations might not work. If you encounter
 errors, please write to <address@hidden> .
 
-For a pre-configured virtual-machine with Savane, see [[SavaneInABox]].
+For a pre-configured virtual machine with Savane, see [[SavaneInABox]].
 
-## TL;DR;
+## The recipe:
 
     # Install required packages
     sudo apt-get install apache2 libapache2-mod-php5 \
@@ -49,14 +49,16 @@
 Now visit <http://localhost:50080>.  
 Login with user `admin` password `admin` or `localuser` password `12345`.
 
+More details follow ...
+
 ## Requirements
 
 The PHP frontend requires `apache2` with `php5` and `MySQL 5`.
 
 This demo will run as non-root user, there is no need to setup
 anything globally (in `/etc/`). The apache and mysql servers do not
-even need to be running on your server (this demo will configure
-and run them as normal user).
+need to be otherwise running on your server (this demo will configure
+and run them as a normal user).
 
 On a `DEB`-based system, install the following packages:
 
@@ -120,8 +122,9 @@
 7. `local-db-cli` - runs the command-line interface (`mysql`) to the database.
     Allows running SQL commands directly.
 
-`local-apache2-start`, `local-apache2-stop`, `local-db-start` and 
`local-db-stop`
-are safe to run repeatedly. They start/stop the servers as current (non-root) 
user.
+`local-apache2-start`, `local-apache2-stop`, `local-db-start` and
+`local-db-stop` are safe to run repeatedly. They start/stop the servers
+as the current (non-root) user.
 
 `local-db-setup-*` should be run once, to populate the database.
 
@@ -173,7 +176,8 @@
     named `$sys_unix_group_name`, which must contain the name of a existing,
     valid project in the database.  
     When using the *tiny* database setup, this name is `siteadmin`.  
-    If something went wrong during automatic setup, this field might be 
invalid - Fix it manually.
+    If something went wrong during automatic setup, this field might be
+    invalid - Fix it manually.
 
 6. `Internal Server Error`, and the log file `./local/apache2/logs/error_log`
     contains errors such as
@@ -199,8 +203,9 @@
 2. The apache error log `./local/apache2/logs/error_log` will contain the
     `STDERR` from PHP.
 
-    In the php code, call `error_log("hello world");` to send this message to 
STDERR.
+    In the php code, call `error_log("hello world");` to send this
+    message to STDERR.
 
     To print a variable, call `error_log(print_r($VAR,TRUE));`.
 
-    Then monitor the error log with `tail -f ./loval/apache2/logs/error_log`.
+    Then monitor the error log with `tail -f ./local/apache2/logs/error_log`.

Modified: trunk/sviki/SavaneInABox.mdwn
===================================================================
--- trunk/sviki/SavaneInABox.mdwn       2014-10-04 01:55:04 UTC (rev 100)
+++ trunk/sviki/SavaneInABox.mdwn       2014-10-09 17:34:47 UTC (rev 101)
@@ -1,8 +1,9 @@
-# Pre-Configured Savane Virtual Machine
+# Savannah in a box - pre-configured Savane virtual machine
 
-The ease hacking on GNU Savane, here's a pre-configured virtual machine
-containing a running Front-End (MySQL + Apache2) of Savane (the GNU Savannah
-software).
+To ease hacking on GNU Savane, here's a pre-configured virtual machine
+containing a running front-end (MySQL + Apache2) of Savane (the GNU Savannah
+software).  To install an instance locally, with no virtual machine involved,
+see [[RunningSavaneLocally]].
 
 Please write to <address@hidden> with any questions or
 suggestions regarding this VM image.
@@ -40,7 +41,7 @@
 1. The image is based on gNewSense 3.1, as configured here:
  <http://www.nongnu.org/pretest/manual/#gNewSense-3_002e1>
 
-2. GNU Savane is locally installed as detailed here: [[RunningSavaneLocally]].
+2. GNU Savane is locally installed as detailed in [[RunningSavaneLocally]].
 
 3. Inside the virtual machine, the file `/etc/rc.local` contains a `sudo`
    command to automatically start a local server of Savane, running as non-root
@@ -63,15 +64,17 @@
    The user can `sudo` without a password.
 4. The MySQL root password is '12345'.
 5. The code is running from `/home/miles/savane/`.
-6. By default, the `savane-in-a-box.sh` runs QEMU/KVM in **snapshot** mode -
+6. By default, `savane-in-a-box.sh` runs QEMU/KVM in **snapshot** mode -
    meaning changes are **NOT** saved back to the VM disk (i.e. after
    terminating the VM, your changes will be lost).  
    To save changes back to the image:
     1. Use `savane-in-a-box.sh -S`, or
-    2. On the guest's console, type `CTRL-A,C` to switch to QEMU's monitor 
mode,
-       Then run `commit all` to save the current filesystem state back to the 
disk.  
-       When using this method, it is highly recommended to shutdown the VM with
-       `shutdown -H -h now` when you're done, the switch to QMEU's monitor 
mode,
-       and `commit all` your changes again (otherwise, you'll commit the 
filesystem
+    2. On the guest's console, type `CTRL-A,C` to switch to QEMU's
+       monitor mode, Then run `commit all` to save the current
+       filesystem state back to the disk.  When using this method, it is
+       highly recommended to shutdown the VM with `shutdown -H -h now`
+       when you're done, the switch to QMEU's monitor mode, and `commit
+       all` your changes again (otherwise, you'll commit the filesystem
        in `unclean` state).
-7. To hack on the Frontend (php) files, look in 
`/home/miles/savane/frontend/php`.
+7. To hack on the frontend (php) files, look in
+`/home/miles/savane/frontend/php`.

Modified: trunk/sviki/SavaneTasks.mdwn
===================================================================
--- trunk/sviki/SavaneTasks.mdwn        2014-10-04 01:55:04 UTC (rev 100)
+++ trunk/sviki/SavaneTasks.mdwn        2014-10-09 17:34:47 UTC (rev 101)
@@ -179,9 +179,9 @@
     SELECT AVG(sum) FROM (SELECT ip, count(*) AS sum FROM spam_stats WHERE 
(check_value IS NOT NULL OR check_value != '421') AND details LIKE "%http%" 
GROUP BY ip ORDER BY sum) AS average;
     -- Posts per IP suspicious and per day
     SELECT DATE_FORMAT(date, '%Y-%m-%d') AS day,ip, count(*) AS sum FROM 
spam_stats WHERE (check_value IS NOT NULL OR check_value != '421') AND details 
LIKE "%http%" GROUP BY day,ip ORDER BY day,sum;
-    -- Number of different IP adresses
+    -- Number of different IP addresses
     SELECT COUNT(DISTINCT ip) FROM spam_stats;
-    -- Average number of different apparently-spamming IP adresses per day
+    -- Average number of different apparently-spamming IP addresses per day
     SELECT AVG(dist_ip) FROM (SELECT DATE_FORMAT(date, '%Y-%m-%d') AS 
day,count(distinct ip) AS dist_ip FROM spam_stats WHERE (check_value IS NOT 
NULL OR check_value != '421') AND details LIKE "%http%" GROUP BY day ORDER BY 
day,dist_ip) AS ips_per_day;
 
 Check for an analysis after \~1 day:
@@ -335,7 +335,7 @@
     a new Savane post type that is text-only (not interpreted with
     wiki-style markup).
 
-Existing implementations (how do they adress the points above?):
+Existing implementations (how do they address the points above?):
 
 -   For Bugzilla:
     <http://project.juiblex.co.uk/hg/sf2bz>

Modified: trunk/sviki/SavannahHackersCommunication.mdwn
===================================================================
--- trunk/sviki/SavannahHackersCommunication.mdwn       2014-10-04 01:55:04 UTC 
(rev 100)
+++ trunk/sviki/SavannahHackersCommunication.mdwn       2014-10-09 17:34:47 UTC 
(rev 101)
@@ -72,7 +72,7 @@
 savannah.gnu.org and savannah.nongnu.org point to
 savannah-hackers-private.
 
-Useful for, eg. [[CAcert]].org that uses those adresses to reach a
+Useful for, eg. [[CAcert]].org that uses those addresses to reach a
 domain owner.
 
 IRC

Modified: trunk/sviki/UsingGnuArch.mdwn
===================================================================
--- trunk/sviki/UsingGnuArch.mdwn       2014-10-04 01:55:04 UTC (rev 100)
+++ trunk/sviki/UsingGnuArch.mdwn       2014-10-09 17:34:47 UTC (rev 101)
@@ -59,7 +59,7 @@
 
        # Go in your current sources directory:
        cd project_directory-X.Y.Z
-       # Add GNU Arch administrativia ({arch}):
+       # Add GNU Arch administrivia ({arch}):
        tla init-tree your_project--main--0
        # Tell GNU Arch which files to import ("register files"):
        tla inventory --names --source --both --unescaped \