summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-23 21:22:02 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-23 21:22:02 +0000
commite91fc44d4c06004567a6b4cdde26031c3699224a (patch)
tree85d1b9ad5f89ddc471b77850f203d400d91131a4
parente53bba09a97dec922b11b5639a8d911d24aa85f2 (diff)
downloadmpv-e91fc44d4c06004567a6b4cdde26031c3699224a.tar.bz2
mpv-e91fc44d4c06004567a6b4cdde26031c3699224a.tar.xz
typo: begining --> beginning
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25517 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/tech/formats.txt2
-rw-r--r--DOCS/tech/mirrors/mirror_howto.txt4
-rw-r--r--DOCS/tech/playtree2
-rw-r--r--m_option.c2
-rw-r--r--playtree.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/tech/formats.txt b/DOCS/tech/formats.txt
index 63b49dd37b..7535251216 100644
--- a/DOCS/tech/formats.txt
+++ b/DOCS/tech/formats.txt
@@ -113,7 +113,7 @@
and has more flexible stream options (including network stuff) like ASF.
Headers: header can be placed at the beginning or at the end of file.
- About half of my files has it at the begining, others has it at the end.
+ About half of my files have it at the beginning, others have it at the end.
Broken files are only playable if they have header at the beginning!
Codecs: any codecs allowed, both CBR and VBR.
diff --git a/DOCS/tech/mirrors/mirror_howto.txt b/DOCS/tech/mirrors/mirror_howto.txt
index 53b5329e5a..92dbe81fd2 100644
--- a/DOCS/tech/mirrors/mirror_howto.txt
+++ b/DOCS/tech/mirrors/mirror_howto.txt
@@ -78,7 +78,7 @@ Using a lock file is recommended but not necessary. The temporary file
generation is handled by `mktemp` which is available from
http://www.mktemp.org/mktemp/ .
-The script contains a few configuration variables at the begining that
+The script contains a few configuration variables at the beginning that
can and should be set:
PATH: The $PATH to be used within the script (recommended).
LOCK: The full path to the lock file to be used (/var/lock/mplayer-mirror-lock
@@ -137,7 +137,7 @@ DO NOT send the private key to the mirror mailing list.
The public key should be placed in the ~/.ssh/authorized_keys file of the
user running the updates. To restrict the ssh key to only one command place
-the following directives at the begining of the line with the key:
+the following directives at the beginning of the line with the key:
from="*.mplayerhq.hu",command="<path_to_update_mplayer_rsync>"
e.g.:
---
diff --git a/DOCS/tech/playtree b/DOCS/tech/playtree
index d2919ea2b3..448c378099 100644
--- a/DOCS/tech/playtree
+++ b/DOCS/tech/playtree
@@ -87,7 +87,7 @@ PLAY_TREE_ITER_ERROR : obvious
PLAY_TREE_ITER_ENTRY : we are now on an entry
PLAY_TREE_ITER_NODE : we are now on a node
PLAY_TREE_ITER_END : we are now at end
-(( Note : I must add a PLAY_TREE_ITER_BEGINING for the begining. Don't know
+(( Note : I must add a PLAY_TREE_ITER_BEGINNING for the beginning. Don't know
what it will return in a such case. PLAY_TREE_ITER_ERROR ? ))
There is also play_tree_iter_up_step which can be used to break a loop or skip
diff --git a/m_option.c b/m_option.c
index 4ce5c60dbc..e2a644402b 100644
--- a/m_option.c
+++ b/m_option.c
@@ -661,7 +661,7 @@ const m_option_type_t m_option_type_string_list = {
"A list of strings separated by ','\n"
"Option with a name ending in an * permits using the following suffix: \n"
"\t-add: Add the given parameters at the end of the list.\n"
- "\t-pre: Add the given parameters at the begining of the list.\n"
+ "\t-pre: Add the given parameters at the beginning of the list.\n"
"\t-del: Remove the entry at the given indices.\n"
"\t-clr: Clear the list.\n"
"e.g: -vf-add flip,mirror -vf-del 2,5\n",
diff --git a/playtree.c b/playtree.c
index 0f3ec5737a..ead621b4fe 100644
--- a/playtree.c
+++ b/playtree.c
@@ -169,7 +169,7 @@ play_tree_remove(play_tree_t* pt, int free_it, int with_children) {
assert(pt->prev->next == pt);
#endif
pt->prev->next = NULL;
- } // Begining of list
+ } // Beginning of list
else if(pt->next) {
#ifdef MP_DEBUG
assert(pt->next->prev == pt);