Commits

a1ex  committed cd1a8d2

Small doc update (mostly formatting tweaks for in-camera BMP)

  • Participants
  • Parent commits ed1ca77
  • Tags ML2.3-RC5

Comments (0)

Files changed (4)

File doc/MANUAL.txt

 
 However, the following cameras do not have a dedicated movie mode. For these cameras, Magic Lantern considers the following configurations as "movie mode":
 
-* **Canon 5D Mark II**: in *LiveView*, with *movie recording enabled* AND *LiveView display set to Movie*. Tip: you can change LiveView display type from Expo menu.
+* **Canon 5D Mark II**: in *LiveView*, with *movie recording enabled* AND *LiveView display set to Movie*.
 * **Canon 50D**: in *LiveView*, with *movie recording enabled* from ML menu.
 
 When movie mode is active, Magic Lantern will show a ``Mv`` symbol on the bottom info bar. In this mode, certain ML tools that normally work for stills (like intervalometer or audio remote shot) will change their behavior and will record movies.
 * ISO: values with low noise (negative digital gain) are displayed in green.
 * Clipping dots on histogram: they appear when the image contains overexposed areas.
 * Green/magenta white balance shift: not all cameras let you adjust these in movie mode; fine-tune them from White Balance submenu in ML menu.
-* Focus distance: this is displayed for most newer Canon lenses. If your lens does not report focus distance, ML will display the AF/MF status instead. Detailed `focus and DOF info`_ is displayed in the Focus menu.
+#* Focus distance: this is displayed for most newer Canon lenses. If your lens does not report focus distance, ML will display the AF/MF status instead. Detailed `focus and DOF info`_ is displayed in the Focus menu.
 
 .. _shortcut keys:
 

File doc/MN-SHOOT.txt

 * To preview HDR images in camera, set `SET+MainDial`_: ExposureFusion from `Prefs`_ menu, Image review settings, 
   then go to playback mode, hold ``SET`` and turn the main dial (wheel).
   
-* For each HDR picture set, Magic Lantern may also write a bash script for stacking the exposures
-  with `enfuse <http://wiki.panotools.org/Enfuse>`_ (version 4.x), with optional alignment (align_image_stack). More info: `Exposure Fusion: What is it? How does it Compare to HDR? How Do I Do It? <http://www.digital-photography-school.com/exposure-fusion-what-is-it-how-does-it-compare-to-hdr-how-do-i-do-it>`_.
+#* For each HDR picture set, Magic Lantern may also write a bash script for stacking the exposures
+#  with `enfuse <http://wiki.panotools.org/Enfuse>`_ (version 4.x), with optional alignment (align_image_stack). More info: `Exposure Fusion: What is it? How does it Compare to HDR? How Do I Do It? <http://www.digital-photography-school.com/exposure-fusion-what-is-it-how-does-it-compare-to-hdr-how-do-i-do-it>`_.
 
 .. _intervalometer:
 

File doc/mkdoc-cam.py

     f.write(txt)
     f.close()
 
+def replace(file, fr, to):
+    txt = open(file).read()
+    txt = txt.replace(fr, to);
+    f = open(file,"w")
+    f.write(txt)
+    f.close()
+
 def fixwikilinks(file):
     txt = open(file).read()
 
 os.system(r"sed -i -e 's/<=/$\\le$/g' UserGuide-cam.tex")
 os.system(r"sed -i -e 's/kOhm/$\\textrm k\\Omega$/g' UserGuide-cam.tex")
 
+replace("UserGuide-cam.tex", r"""\newpage\subsection*{\phantomsection%
+  Movie mode%""", r"""\subsection*{\phantomsection%
+  Movie mode%""");
+
+replace("UserGuide-cam.tex", r"""\newpage\subsection*{\phantomsection%
+  PLAY mode shortcuts%""", r"""\subsection*{\phantomsection%
+  PLAY mode shortcuts%""");
+
+
+  
+
 #~ os.system(r"sed -i -e 's/\\addcontentsline{toc}{section}{Features}//g' UserGuide-cam.tex")
 os.system("lualatex -interaction=batchmode UserGuide-cam.tex")
 #~ os.system("lualatex -interaction=batchmode UserGuide-cam.tex")

File doc/ug-template-cam.tex

 
 %%% Body
 \begin{document}
-\title{\vspace{-1cm}\includegraphics[width=3cm]{logo-trans.png}\\Magic Lantern v2.3 RC3\\{\small \vskip1mm Stable ports: Canon 5D Mark II, 550D, 60D, 600D, 50D and 500D \\\vskip-3mm \scriptsize Ports in progress: Canon 5D Mark III, Canon 5D (classic), Canon 1100D/T3 }}
+\title{\vspace{-1cm}\includegraphics[width=3cm]{logo-trans.png}\\Magic Lantern v2.3 RC5\\{\small \vskip1mm Stable ports: Canon 5D Mark II, 550D, 60D, 600D, 50D and 500D \\\vskip-3mm \scriptsize Ports in progress: Canon 5D Mark III, Canon 5D (classic), Canon 1100D/T3 }}
 \author{\url{www.magiclantern.fm}}
+\date{July 21, 2012}
 \maketitle
 
 %~ \setlength{\baselineskip}{0mm plus1fil}