From: Andre Noll Date: Tue, 9 Aug 2011 22:58:58 +0000 (+0200) Subject: manual: A couple of minor improvements. X-Git-Tag: v0.4.8~13 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=42c4c4fa5662d5cb0f362ace04d26e9189e165b2 manual: A couple of minor improvements. Rewording, an external link to libosl, removal of duplicate information and a typo fix. --- diff --git a/web/manual.m4 b/web/manual.m4 index f7071167..7163bb7b 100644 --- a/web/manual.m4 +++ b/web/manual.m4 @@ -498,12 +498,13 @@ as follows: - para_client connects to para_server and sends an authentication request for a user. It does so by connecting - to para_server, TCP 2990, the control port of para_server. + to TCP port 2990 of the server host. This port is called the + para_server _control port_. - para_server accepts the connection and forks a child process - which is supposed to handle the connection. The parent process - keeps listening on the control port while the child process - (also called para_server below) continues as follows. + which handles the incoming request. The parent process keeps + listening on the control port while the child process (also + called para_server below) continues as follows. - para_server loads the RSA public key of that user, fills a fixed-length buffer with random bytes, encrypts that buffer @@ -513,7 +514,7 @@ as follows: session key. - para_client receives the encrypted buffer and decrypts it - using the user's private key, thereby obtaining the challenge + with the user's private key, thereby obtaining the challenge buffer and the session key. It sends the SHA1 hash value of the challenge back to para_server and stores the session key for further use. @@ -542,8 +543,8 @@ file, below). The user_list file ~~~~~~~~~~~~~~~~~~ -At startup para_server reads the user list file which must contain -one line per user. The default location of the user list file may be +At startup para_server reads the user list file which contains one +line per user. The default location of the user list file may be changed with the --user_list option. There should be at least one user in this file. Each user must have @@ -610,10 +611,11 @@ known audio files to those which satisfy certain criteria. It also maintains tables containing images (e.g. album cover art) and lyrics that can be associated with one or more audio files. -AFS uses libosl, the object storage layer, as the backend library -for storing information on audio files, playlists, etc. This library -offers functionality similar to a relational database, but is much -more lightweight than a full database backend. +AFS uses XREFERENCE(http://systemlinux.org/~maan/osl/, libosl), the +object storage layer library, as the backend library for storing +information on audio files, playlists, etc. This library offers +functionality similar to a relational database, but is much more +lightweight than a full database backend. In this chapter we sketch the setup of the REFERENCE(The AFS process, AFS process) during server startup and proceed with the description @@ -623,7 +625,7 @@ and moods) explains these two audio file selection mechanisms in detail and contains pratical examples. The way REFERENCE(File renames and content changes, file renames and content changes) are detected is discussed briefly before the REFERENCE(Troubleshooting, -Troubleshooting) section which concludes the chapter. +Troubleshooting) section concludes the chapter. The AFS process ~~~~~~~~~~~~~~~ @@ -726,7 +728,7 @@ Similarly, the "test" bit can be removed from an audio file with para_client setatt test- /path/to/the/audio/file Instead of a path you may use a shell wildcard pattern. The attribute -is applied to all audio files matching that pattern: +is applied to all audio files matching this pattern: para_client setatt test+ '/test/directory/*' @@ -782,7 +784,7 @@ can be used. Note that the images and lyrics are not interpreted at all, and also the playlist and the mood blobs are only investigated when the mood -or playlist is activated by using the select command. +or playlist is activated with the select command. *The score table* @@ -798,7 +800,9 @@ next. While doing so, it computes the new score and updates the last_played and the num_played fields in the audio file table. The score table is recomputed by the select command which loads a -new mood or playlist. +mood or playlist. Audio files are chosen for streaming from the rows +of the score table on a highest-score-first basis. + Playlists and moods ~~~~~~~~~~~~~~~~~~~ @@ -810,17 +814,12 @@ terms of attributes and other type of information available in the audio file table. As an example, a mood can define a filename pattern, which is then matched against the names of audio files in the table. -Selecting a mood or playlist means the generation of a ranking -(a score table) for the set of admissible files. Audio files are -then selected on a highest-score-first basis. The score table is -recomputed at the moment the mood or playlist is selected. - *Playlists* Playlists are accommodated in the playlist table of the afs database, -using the aforementioned blob format for tables. A new filelist is -created using the addpl command, by specifying the full (absolute) -paths of all desired audio files, separated by newlines. For example +using the aforementioned blob format for tables. A new playlist is +created with the addpl command by specifying the full (absolute) +paths of all desired audio files, separated by newlines. Example: find /my/mp3/dir -name "*.mp3" | para addpl my_playlist @@ -840,7 +839,7 @@ A mood consists of a unique name and its *mood definition*, which is a set of *mood lines* containing expressions in terms of attributes and other data contained in the database. -At any time, at most one mood can be *active* which means that +At any time at most one mood can be *active* which means that para_server is going to select only files from that subset of admissible files. @@ -950,7 +949,7 @@ The year tag is special as its value is undefined if the audio file has no year tag or the content of the year tag is not a number. Such audio files never match. Another difference is the special treatment if the year tag is a two-digit number. In this case either 1900 or -2000 are added to the tag value depending on whether the number is +2000 is added to the tag value, depending on whether the number is greater than 2000 plus the current year. @@ -1886,7 +1885,7 @@ the tip of topic branches you are interested in from the output of "git log next"). You should be able to safely build on top of them. However, at times "next" will be rebuilt from the tip of "master" to -get rid of merge commits that will never be in "master. The commit +get rid of merge commits that will never be in "master". The commit that replaces "next" will usually have the identical tree, but it will have different ancestry from the tip of "master".